Fixes another N+1 location in the AI indexing, including the per document update which would hurt

2026-08-26 12:43:19 +00:00 · 2026-08-12 12:44:00 -07:00
228 changed files with 8723 additions and 12733 deletions
@@ -68,7 +68,7 @@ services:
      - "--chromium-disable-javascript=true"
      - "--chromium-allow-list=file:///tmp/.*"
  tika:
-    image: docker.io/apache/tika:3.3.1.0
+    image: docker.io/apache/tika:latest
    restart: unless-stopped
 volumes:
  data:
@@ -11,7 +11,7 @@ concurrency:
  group: backend-${{ github.event.pull_request.number || github.ref }}
  cancel-in-progress: true
 env:
-  DEFAULT_UV_VERSION: "0.12.x"
+  DEFAULT_UV_VERSION: "0.11.x"
  NLTK_DATA: "/usr/share/nltk_data"
 permissions: {}
 jobs:
@@ -11,7 +11,7 @@ concurrency:
 permissions:
  contents: read
 env:
-  DEFAULT_UV_VERSION: "0.12.x"
+  DEFAULT_UV_VERSION: "0.11.x"
  DEFAULT_PYTHON_VERSION: "3.12"
 jobs:
  changes:
@@ -83,7 +83,7 @@ jobs:
      - name: Install pnpm
        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
        with:
-          package_json_file: src-ui/package.json
+          version: 10
      - name: Use Node.js 24
        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
@@ -115,7 +115,7 @@ jobs:
      - name: Install pnpm
        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
        with:
-          package_json_file: src-ui/package.json
+          version: 10
      - name: Use Node.js 24
        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
@@ -154,7 +154,7 @@ jobs:
      - name: Install pnpm
        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
        with:
-          package_json_file: src-ui/package.json
+          version: 10
      - name: Use Node.js 24
        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
@@ -209,7 +209,7 @@ jobs:
      - name: Install pnpm
        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
        with:
-          package_json_file: src-ui/package.json
+          version: 10
      - name: Use Node.js 24
        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
@@ -243,7 +243,7 @@ jobs:
      - name: Install pnpm
        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
        with:
-          package_json_file: src-ui/package.json
+          version: 10
      - name: Use Node.js 24
        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
@@ -8,7 +8,7 @@ concurrency:
  group: release-${{ github.ref }}
  cancel-in-progress: false
 env:
-  DEFAULT_UV_VERSION: "0.12.x"
+  DEFAULT_UV_VERSION: "0.11.x"
  DEFAULT_PYTHON_VERSION: "3.12"
 permissions: {}
 jobs:
@@ -42,7 +42,7 @@ jobs:
      - name: Install pnpm
        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
        with:
-          package_json_file: src-ui/package.json
+          version: 10
      - name: Use Node.js 24
        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
@@ -4,7 +4,7 @@ on:
    branches:
      - dev
 env:
-  DEFAULT_UV_VERSION: "0.12.x"
+  DEFAULT_UV_VERSION: "0.11.x"
 jobs:
  generate-translate-strings:
    name: Generate Translation Strings
@@ -45,7 +45,7 @@ jobs:
      - name: Install pnpm
        uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
        with:
-          package_json_file: src-ui/package.json
+          version: 10
      - name: Use Node.js 24
        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
@@ -30,7 +30,7 @@ RUN set -eux \
 # Purpose: Installs s6-overlay and rootfs
 # Comments:
 #  - Don't leave anything extra in here either
-FROM ghcr.io/astral-sh/uv:0.12.5-python3.14-trixie-slim AS s6-overlay-base
+FROM ghcr.io/astral-sh/uv:0.11.32-python3.12-trixie-slim AS s6-overlay-base

 WORKDIR /usr/src/s6

@@ -81,7 +81,7 @@ services:
      - "--chromium-disable-javascript=true"
      - "--chromium-allow-list=file:///tmp/.*"
  tika:
-    image: docker.io/apache/tika:3.3.1.0
+    image: docker.io/apache/tika:latest
    restart: unless-stopped
 volumes:
  data:
@@ -76,7 +76,7 @@ services:
      - "--chromium-disable-javascript=true"
      - "--chromium-allow-list=file:///tmp/.*"
  tika:
-    image: docker.io/apache/tika:3.3.1.0
+    image: docker.io/apache/tika:latest
    restart: unless-stopped
 volumes:
  data:
@@ -65,7 +65,7 @@ services:
      - "--chromium-disable-javascript=true"
      - "--chromium-allow-list=file:///tmp/.*"
  tika:
-    image: docker.io/apache/tika:3.3.1.0
+    image: docker.io/apache/tika:latest
    restart: unless-stopped
 volumes:
  data:
@@ -68,14 +68,7 @@
  <!-- <policy domain="resource" name="thread" value="4"/> -->
  <!-- <policy domain="resource" name="throttle" value="0"/> -->
  <!-- <policy domain="resource" name="time" value="3600"/> -->
-  <!-- Paperless does not process SVG or ImageMagick scripting formats. -->
-  <policy domain="coder" rights="none" pattern="SVG" />
-  <policy domain="coder" rights="none" pattern="SVGZ" />
-  <policy domain="coder" rights="none" pattern="MSVG" />
-  <policy domain="coder" rights="none" pattern="RSVG" />
-  <policy domain="coder" rights="none" pattern="MSL" />
-  <policy domain="coder" rights="none" pattern="MVG" />
-  <policy domain="coder" rights="none" pattern="EPHEMERAL" />
+  <!-- <policy domain="coder" rights="none" pattern="MVG" /> -->
  <!-- <policy domain="module" rights="none" pattern="{PS,PDF,XPS}" /> -->
  <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
  <!-- <policy domain="path" rights="none" pattern="@*" /> -->
@@ -85,6 +78,8 @@
  <!-- <policy domain="system" name="pixel-cache-memory" value="anonymous"/> -->
  <!-- <policy domain="system" name="shred" value="2"/> -->
  <!-- <policy domain="system" name="precision" value="6"/> -->
+  <!-- not needed due to the need to use explicitly by mvg: -->
+  <!-- <policy domain="delegate" rights="none" pattern="MVG" /> -->
  <!-- use curl -->
  <policy domain="delegate" rights="none" pattern="URL" />
  <policy domain="delegate" rights="none" pattern="HTTPS" />
@@ -299,8 +299,6 @@ optional arguments:
 -sm, --split-manifest
 -z,  --zip
 -zn, --zip-name
--zip-compression
--zip-compression-level
 --data-only
 --no-progress-bar
 --passphrase
@@ -363,19 +361,6 @@ If `-z` or `--zip` is provided, the export will be a zip file
 in the target directory, named according to the current local date or the
 value set in `-zn` or `--zip-name`.

-The compression method for the zip can be set with `--zip-compression`
-(`stored`, `deflated` (default), `bzip2`, `lzma`, or `zstd`) and tuned with
-`--zip-compression-level` (deflated: 0–9, bzip2: 1–9, zstd: -22–22; ignored
-for `stored` and `lzma`). Both options require `--zip`.
-
-!!! warning
-
-    `zstd` compression requires Python 3.14 or newer on **both** the machine
-    creating the export and any machine importing it. An archive compressed with
-    `zstd` (or `lzma`/`bzip2` where those modules are unavailable) cannot be
-    imported on a runtime that lacks the codec; the importer will refuse it with
-    a clear error. The default `deflated` is universally readable.
-
 If `--data-only` is provided, only the database will be exported. This option is intended
 to facilitate database upgrades without needing to clean documents and thumbnails from the media directory.

@@ -129,10 +129,6 @@ At a minimum you need to enable AI and choose an LLM backend:
  and/or [`PAPERLESS_AI_LLM_ENDPOINT`](configuration.md#PAPERLESS_AI_LLM_ENDPOINT). Ollama
  requires `PAPERLESS_AI_LLM_ENDPOINT` pointing at your Ollama server.

-See the community-maintained wiki page on
-[choosing AI models](https://github.com/paperless-ngx/paperless-ngx/wiki/AI-Model-Recommendations)
-for suggested generation and embedding models.
-
 ### AI-assisted suggestions

 With AI enabled, Paperless-ngx can suggest a title, tags, correspondent, document type,
@@ -812,8 +808,7 @@ Third-party parser plugins extend Paperless-ngx to support additional file
 formats. A plugin is a Python package that advertises itself under the
 `paperless_ngx.parsers` entry point group. Refer to the
 [developer documentation](development.md#making-custom-parsers) for how to
-create one, or see the wiki for a community-maintained list of
-[parser plugins](https://github.com/paperless-ngx/paperless-ngx/wiki/Related-Projects#parser-plugins).
+create one.

 !!! warning "Third-party plugins are not officially supported"

@@ -227,7 +227,6 @@ Version-aware endpoints:
 - `PATCH /api/documents/{id}/`: content updates target the selected version (`?version={version_id}`) or latest version by default; non-content metadata updates target the root document.
 - `GET /api/documents/{id}/download/`, `GET /api/documents/{id}/preview/`, `GET /api/documents/{id}/thumb/`, `GET /api/documents/{id}/metadata/`: accept `?version={version_id}`.
 - `POST /api/documents/{id}/update_version/`: uploads a new version using multipart form field `document` and optional `version_label`.
- `POST /api/documents/merge_as_versions/`: merges existing top-level documents as versions of a selected root. The JSON body must contain `documents` (at least two document IDs) and `root_document_id` (one of those IDs). When merging one source document, an optional `version_label` may be provided.
 - `PATCH /api/documents/{id}/versions/{version_id}/`: updates the `version_label` of a specific version.
 - `DELETE /api/documents/{root_id}/versions/{version_id}/`: deletes a non-root version.

@@ -302,8 +301,7 @@ The following methods are supported:
 - `delete`
  - No `parameters` required
 - `reprocess`
-  - Optional `parameters`: `{ "remote_ocr": true }` to send the documents to the
-    remote OCR engine, see [Remote OCR](usage.md#remote-ocr). Defaults to false.
+  - No `parameters` required
 - `set_permissions`
  - Requires `parameters`:
    - `"set_permissions": PERMISSIONS_OBJ` (see format [above](#permissions)) and / or
@@ -776,24 +776,6 @@ system. See the corresponding

    Defaults to "groups"

-#### [`PAPERLESS_SOCIAL_ACCOUNT_SYNC_SUPERUSER_GROUP=<str>`](#PAPERLESS_SOCIAL_ACCOUNT_SYNC_SUPERUSER_GROUP) {#PAPERLESS_SOCIAL_ACCOUNT_SYNC_SUPERUSER_GROUP}
-
-: Allows you to define a group name that, if present in the third-party authentication system's groups claim, will grant the user superuser (admin) and staff status in Paperless-ngx. If the group is not present in the claim, superuser status will be revoked upon next login.
-
-    !!! warning
-        This is a direct reflection of the claim on every login, including the connecting user, with no exemption for the last remaining admin. If the group is missing or misconfigured on the identity provider side, the logged-in user will immediately lose their own superuser access. Fix the group membership or claim mapping on the identity provider to restore it. If the identity provider itself is unreachable or misconfigured and you are locked out, you can recover admin access locally with `manage.py createsuperuser`.
-
-    Defaults to None
-
-#### [`PAPERLESS_SOCIAL_ACCOUNT_SYNC_STAFF_GROUP=<str>`](#PAPERLESS_SOCIAL_ACCOUNT_SYNC_STAFF_GROUP) {#PAPERLESS_SOCIAL_ACCOUNT_SYNC_STAFF_GROUP}
-
-: Allows you to define a group name that, if present in the third-party authentication system's groups claim, will grant the user staff status in Paperless-ngx. If the group is not present in the claim and the user is not a superuser, staff status will be revoked upon next login.
-
-    !!! warning
-        As with [`PAPERLESS_SOCIAL_ACCOUNT_SYNC_SUPERUSER_GROUP`](#PAPERLESS_SOCIAL_ACCOUNT_SYNC_SUPERUSER_GROUP), this is applied on every login unconditionally, including for the connecting user themselves.
-
-    Defaults to None
-
 #### [`PAPERLESS_SOCIAL_ACCOUNT_DEFAULT_GROUPS=<comma-separated-list>`](#PAPERLESS_SOCIAL_ACCOUNT_DEFAULT_GROUPS) {#PAPERLESS_SOCIAL_ACCOUNT_DEFAULT_GROUPS}

 : A list of group names that users who signup via social accounts will be added to upon signup. Groups listed here must already exist.
@@ -1215,7 +1197,7 @@ should be a valid crontab(5) expression describing when to run.

 : If set to the string "disable", no emails will be fetched automatically.

-    Defaults to every ten minutes, with an installation-specific minute offset.
+    Defaults to `*/10 * * * *` or every ten minutes.

 #### [`PAPERLESS_TRAIN_TASK_CRON=<cron expression>`](#PAPERLESS_TRAIN_TASK_CRON) {#PAPERLESS_TRAIN_TASK_CRON}

@@ -2066,18 +2048,6 @@ password. All of these options come from their similarly-named [Django settings]

    Defaults to None.

-#### [`PAPERLESS_REMOTE_OCR_MODE=<str>`](#PAPERLESS_REMOTE_OCR_MODE) {#PAPERLESS_REMOTE_OCR_MODE}
-
-: Which documents are sent to the remote OCR engine.
-
-    - `always`: every document of a supported file type is sent to the remote
-      engine, bypassing the local OCR engine.
-    - `workflow_only`: documents are processed locally unless a workflow
-      explicitly enables remote OCR for them, letting you use the remote engine
-      selectively.
-
-    Defaults to "always".
-
 ## AI {#ai}

 #### [`PAPERLESS_AI_ENABLED=<bool>`](#PAPERLESS_AI_ENABLED) {#PAPERLESS_AI_ENABLED}
@@ -2100,8 +2070,6 @@ suggestions. This setting is required to be set to true in order to use the AI f
 models supported by the current embedding backend. If not supplied, defaults to
 "text-embedding-3-small" for the OpenAI-compatible backend,
 "sentence-transformers/all-MiniLM-L6-v2" for Huggingface, and "embeddinggemma" for Ollama.
-See [choosing AI models](https://github.com/paperless-ngx/paperless-ngx/wiki/AI-Model-Recommendations)
-for language and resource considerations.

    Defaults to None.

@@ -2158,8 +2126,6 @@ setting is required to be set to use the AI features.
 : The model to use for the AI backend, i.e. "gpt-3.5-turbo", "gpt-4" or any of the models supported
 by the current backend. If not supplied, defaults to "gpt-3.5-turbo" for the OpenAI-compatible
 backend and "llama3.1" for Ollama.
-See [choosing AI models](https://github.com/paperless-ngx/paperless-ngx/wiki/AI-Model-Recommendations)
-for local versus remote and model-size considerations.

    Defaults to None.

@@ -456,20 +456,6 @@ def score(
    return 10
 ```

-**Remote services**
-
-If your parser sends document content to a remote service, declare it:
-
-```python
-class MyCustomParser:
-    uses_remote_service = True
-```
-
-Paperless-ngx excludes such parsers when the document being consumed has not
-been marked for remote processing, so users can keep remote OCR off by default
-and enable it selectively with a workflow. Parsers that do not declare the
-attribute are treated as fully local and are always considered.
-
 **Archive and rendition flags**

 ```python
@@ -156,7 +156,7 @@ The new settings are independent:

 ### Database configuration

-If you changed OCR settings via the admin UI (ApplicationConfiguration), the database values are **migrated automatically** during the upgrade. `mode` values (`skip` / `skip_noarchive`) are mapped to their new equivalents and explicit `skip_archive_file` values are converted to the new `archive_file_generation` field. Users who relied on the old defaults must set `archive_file_generation` to `always` to preserve the v2 behaviour of always creating an archive. After upgrading, review the OCR settings in the admin UI to confirm the migrated values match your intent.
+If you changed OCR settings via the admin UI (ApplicationConfiguration), the database values are **migrated automatically** during the upgrade. `mode` values (`skip` / `skip_noarchive`) are mapped to their new equivalents and `skip_archive_file` values are converted to the new `archive_file_generation` field. After upgrading, review the OCR settings in the admin UI to confirm the migrated values match your intent.

 ### Action Required

@@ -165,9 +165,8 @@ Remove any `PAPERLESS_OCR_SKIP_ARCHIVE_FILE` variable from your environment. If
 ```bash
 # v2: skip OCR when text present, always archive
 PAPERLESS_OCR_MODE=skip
-# v3: equivalent
-PAPERLESS_OCR_MODE=auto
-PAPERLESS_ARCHIVE_FILE_GENERATION=always
+# v3: equivalent (auto is the new default)
+# No change needed - auto is the default

 # v2: skip OCR when text present, skip archive too
 PAPERLESS_OCR_MODE=skip_noarchive
@@ -416,15 +416,22 @@ to a positive number to enable polling and disable native filesystem notificatio
        You may need to change the path in the files. Example:
        `ExecStart=/opt/paperless/.local/bin/celery --app paperless worker --loglevel INFO`

-12. Configure ImageMagick to allow processing of PDF documents and disable
-    formats that Paperless-ngx does not use. Most distributions disable PDF
-    processing by default, since PDF documents can contain malware. If you
-    don't enable it, Paperless-ngx will fall back to Ghostscript for certain
-    steps such as thumbnail generation.
+12. Configure ImageMagick to allow processing of PDF documents. Most
+    distributions have this disabled by default, since PDF documents can
+    contain malware. If you don't do this, Paperless-ngx will fall back to
+    Ghostscript for certain steps such as thumbnail generation.

-    Configure the active ImageMagick policy file (commonly
-    `/etc/ImageMagick-6/policy.xml` or `/etc/ImageMagick-7/policy.xml`) and
-    adjust similar to [the docker policy file](https://raw.githubusercontent.com/paperless-ngx/paperless-ngx/refs/heads/main/docker/rootfs/etc/ImageMagick-6/paperless-policy.xml). You should also include restrictions as noted there.
+    Edit `/etc/ImageMagick-6/policy.xml` and adjust
+
+    ```
+    <policy domain="coder" rights="none" pattern="PDF" />
+    ```
+
+    to
+
+    ```
+    <policy domain="coder" rights="read|write" pattern="PDF" />
+    ```

 **Optional: Install the [jbig2enc](https://ocrmypdf.readthedocs.io/en/latest/jbig2.html) encoder.**
 This will reduce the size of generated PDF documents. You'll most likely need to compile this yourself, because this
@@ -99,10 +99,6 @@ Think of versions as **file history** for a document.
 - By default, search and document content use the latest version.
 - In document detail, selecting a version switches the preview, file metadata and content (and download etc buttons) to that version.
 - Deleting a non-root version keeps metadata and falls back to the latest remaining version.
- From the document list, select two or more documents and choose **Merge as versions** to combine them under one entry. Select the root document whose metadata and permissions should be retained; the other selected documents become file versions. The root may already have versions, but documents being added as versions must not have version histories of their own.
- From a document's **Versions** menu, choose **Existing** to search for another document and add it as a version of the current document.
- Documents merged as versions give up their archive serial number. If the root has no ASN of its own it takes the first one, otherwise the ASNs are released and the removal is logged.
- Merging as versions cannot be undone from the UI, and deleting the root document moves its versions to the trash as well.

 ### Management Lists

@@ -654,19 +650,6 @@ happened while it was still encrypted, that original version will likewise be mi
 **Current limitation**: Passwords are stored as a simple list without descriptions. To handle
 multiple PDF types with different passwords, create separate workflows for each use case.

-##### Remote OCR {#workflow-action-remote-ocr}
-
-"Remote OCR" actions send the document to the configured remote OCR engine instead of processing it
-locally. To use remote OCR selectively, set the [remote OCR mode](configuration.md#PAPERLESS_REMOTE_OCR_MODE)
-to `workflow_only` then add this action to a workflow that matches only the documents you
-want sent to the remote engine. See [Remote OCR](#remote-ocr) for the engine setup. The action only works with
-a **Consumption Started** trigger.
-
-The action takes no options, its presence is what enables remote OCR for a matching document.
-
-If the remote engine is not configured, or does not support the document's file type, the document is
-processed locally instead and a warning is written to the log.
-
 #### Workflow placeholders

 Titles and webhook payloads can be generated by workflows using [Jinja templates](https://jinja.palletsprojects.com/en/3.1.x/templates/).
@@ -1103,19 +1086,11 @@ Paperless-ngx supports performing OCR on documents using remote services. At the
 [Microsoft's Azure "Document Intelligence" service](https://azure.microsoft.com/en-us/products/ai-services/ai-document-intelligence).
 This is of course a paid service (with a free tier) which requires an Azure account and subscription. Azure AI is not affiliated with
 Paperless-ngx in any way. When enabled, Paperless-ngx will automatically send appropriate documents to Azure for OCR processing, bypassing
-the local OCR engine. See the [configuration](configuration.md#PAPERLESS_REMOTE_OCR_ENGINE) options for more details. These
-settings can be supplied as environment variables or via **Application Configuration**.
+the local OCR engine. See the [configuration](configuration.md#PAPERLESS_REMOTE_OCR_ENGINE) options for more details.

 Additionally, when using a commercial service with this feature, consider both potential costs as well as any associated file size
 or page limitations (e.g. with a free tier).

-By default, every document of a supported file type is sent to the remote engine. To use it more selectively, set the
-[remote OCR mode](configuration.md#PAPERLESS_REMOTE_OCR_MODE) to `workflow_only`. Documents are then processed locally
-unless a [remote OCR workflow action](#workflow-action-remote-ocr) enables it for them, so you can limit the remote
-engine to particular documents.
-
-Setting the mode to `workflow_only` also allows the **Reprocess** actions to selectively use remote OCR for individual documents.
-
 ## Architecture

 Paperless-ngx consists of the following components:
@@ -34,8 +34,6 @@ PAPERLESS_SECRET_KEY=change-me
 #PAPERLESS_AUTO_LOGIN_USERNAME=
 #PAPERLESS_COOKIE_PREFIX=
 #PAPERLESS_ENABLE_HTTP_REMOTE_USER=false
-#PAPERLESS_SOCIAL_ACCOUNT_SYNC_SUPERUSER_GROUP=
-#PAPERLESS_SOCIAL_ACCOUNT_SYNC_STAFF_GROUP=

 # OCR settings

@@ -84,9 +84,9 @@ mariadb = [
  "mysqlclient~=2.2.7",
 ]
 postgres = [
-  "psycopg[c,pool]==3.3.4",
+  "psycopg[c,pool]==3.3",
  # Direct dependency for proper resolution of the pre-built wheels
-  "psycopg-c==3.3.4",
+  "psycopg-c==3.3",
  "psycopg-pool==3.3.1",
 ]
 webserver = [
@@ -160,10 +160,8 @@ explicit = true
 [tool.uv.sources]
 # Markers are chosen to select these almost exclusively when building the Docker image
 psycopg-c = [
-  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-trixie-3.3.4/psycopg_c-3.3.4-cp312-cp312-linux_x86_64.whl", marker = "sys_platform == 'linux' and platform_machine == 'x86_64' and python_version == '3.12'" },
-  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-trixie-3.3.4/psycopg_c-3.3.4-cp312-cp312-linux_aarch64.whl", marker = "sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.12'" },
-  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-trixie-3.3.4/psycopg_c-3.3.4-cp314-cp314-linux_x86_64.whl", marker = "sys_platform == 'linux' and platform_machine == 'x86_64' and python_version == '3.14'" },
-  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-trixie-3.3.4/psycopg_c-3.3.4-cp314-cp314-linux_aarch64.whl", marker = "sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.14'" },
+  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-trixie-3.3.0/psycopg_c-3.3.0-cp312-cp312-linux_x86_64.whl", marker = "sys_platform == 'linux' and platform_machine == 'x86_64' and python_version == '3.12'" },
+  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-trixie-3.3.0/psycopg_c-3.3.0-cp312-cp312-linux_aarch64.whl", marker = "sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.12'" },
 ]
 torch = [
  { index = "pytorch-cpu" },
@@ -33,7 +33,7 @@ test('should warn on unsaved changes', async ({ page }) => {
  await page.getByRole('button', { name: 'Close', exact: true }).click()
  await expect(page.getByRole('dialog')).toHaveText(/unsaved changes/)
  await page.getByRole('button', { name: 'Cancel' }).click()
-  await page.getByRole('button', { name: 'Close all' }).click()
+  await page.getByRole('link', { name: 'Close all' }).click()
  await expect(page.getByRole('dialog')).toHaveText(/unsaved changes/)
 })

@@ -11,21 +11,20 @@
  },
  "private": true,
  "dependencies": {
-    "@angular/cdk": "^22.1.1",
-    "@angular/common": "~22.1.1",
-    "@angular/compiler": "~22.1.1",
-    "@angular/core": "~22.1.1",
-    "@angular/forms": "~22.1.1",
-    "@angular/localize": "~22.1.1",
-    "@angular/platform-browser": "~22.1.1",
-    "@angular/router": "~22.1.1",
+    "@angular/cdk": "^22.0.6",
+    "@angular/common": "~22.1.0",
+    "@angular/compiler": "~22.1.0",
+    "@angular/core": "~22.1.0",
+    "@angular/forms": "~22.1.0",
+    "@angular/localize": "~22.1.0",
+    "@angular/platform-browser": "~22.1.0",
+    "@angular/router": "~22.1.0",
    "@ng-bootstrap/ng-bootstrap": "^21.0.0",
-    "@ng-select/ng-select": "~23.6.0",
+    "@ng-select/ng-select": "^23.5.0",
    "@ngneat/dirty-check-forms": "^3.0.3",
    "@popperjs/core": "^2.11.8",
    "bootstrap": "^5.3.8",
    "file-saver": "^2.0.5",
-    "lodash-es": "^4.18.1",
    "mime-names": "^1.0.0",
    "ngx-bootstrap-icons": "^1.9.3",
    "ngx-color": "^10.1.0",
@@ -41,31 +40,30 @@
  },
  "devDependencies": {
    "@angular-builders/jest": "^22.0.1",
-    "@angular-devkit/core": "^22.1.3",
-    "@angular-devkit/schematics": "^22.1.3",
+    "@angular-devkit/core": "^22.1.2",
+    "@angular-devkit/schematics": "^22.1.2",
    "@angular-eslint/builder": "22.1.0",
    "@angular-eslint/eslint-plugin": "22.1.0",
    "@angular-eslint/eslint-plugin-template": "22.1.0",
    "@angular-eslint/schematics": "22.1.0",
    "@angular-eslint/template-parser": "22.1.0",
-    "@angular/build": "22.1.3",
-    "@angular/cli": "22.1.3",
-    "@angular/compiler-cli": "~22.1.1",
-    "@playwright/test": "^1.62.1",
+    "@angular/build": "22.1.2",
+    "@angular/cli": "22.1.2",
+    "@angular/compiler-cli": "~22.1.0",
+    "@playwright/test": "^1.62.0",
    "@types/jest": "^30.0.0",
-    "@types/node": "^26.2.0",
-    "@typescript-eslint/eslint-plugin": "^8.67.0",
-    "@typescript-eslint/parser": "^8.67.0",
-    "@typescript-eslint/utils": "^8.67.0",
-    "eslint": "^10.8.1",
+    "@types/node": "^26.1.1",
+    "@typescript-eslint/eslint-plugin": "^8.65.0",
+    "@typescript-eslint/parser": "^8.65.0",
+    "@typescript-eslint/utils": "^8.65.0",
+    "eslint": "^10.8.0",
    "jest": "30.4.2",
    "jest-environment-jsdom": "^30.4.1",
    "jest-junit": "^17.0.0",
    "jest-preset-angular": "^17.0.0",
    "jest-websocket-mock": "^2.5.0",
-    "prettier": "^3.9.6",
    "prettier-plugin-organize-imports": "^4.3.0",
-    "ts-node": "~10.9.2",
+    "ts-node": "~10.9.1",
    "typescript": "^6.0.3"
  },
  "packageManager": "pnpm@11.15.1"
@@ -6,7 +6,6 @@ trustPolicyExclude:
  - "chokidar@4.0.3"
  - "semver@6.3.1 || 5.7.2"
 blockExoticSubdeps: true
-autoInstallPeers: false
 allowBuilds:
  "@parcel/watcher": true
  canvas: true
@@ -14,48 +14,43 @@
                <a ngbNavLink>{{category}}</a>
                <ng-template ngbNavContent>
                    <div class="p-3">
-                        @for (section of getCategorySections(category); track section) {
-                            @if (section) {
-                                <h5 class="mt-4 mb-3">{{section}}</h5>
-                            }
-                            <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-2">
-                                @for (option of getCategoryOptions(category, section); track option.key) {
-                                    <div class="col">
-                                        <div class="card bg-light">
-                                            <div class="card-body">
-                                                <div class="card-title d-flex align-items-center">
-                                                    <h6 class="mb-0">
-                                                      {{option.title}}
-                                                    </h6>
-                                                    <a class="btn btn-sm btn-link" title="Read the documentation about this setting" i18n-title [href]="getDocsUrl(option.config_key)" target="_blank" referrerpolicy="no-referrer">
-                                                        <i-bs name="info-circle"></i-bs>
-                                                    </a>
-                                                    @if (isSet(option.key)) {
-                                                      <button type="button" class="btn btn-sm btn-link text-danger ms-auto pe-0" title="Reset" i18n-title (click)="resetOption(option.key)">
-                                                          <i-bs class="me-1" name="x"></i-bs><ng-container i18n>Reset</ng-container>
-                                                      </button>
-                                                    }
-                                                </div>
-                                                <div class="mb-n3">
-                                                    @switch (option.type) {
-                                                        @case (ConfigOptionType.Select) { <pngx-input-select [formControlName]="option.key" [error]="errors[option.key]" [items]="option.choices" [allowNull]="true"></pngx-input-select> }
-                                                        @case (ConfigOptionType.Number) { <pngx-input-number [formControlName]="option.key" [error]="errors[option.key]" [showAdd]="false"></pngx-input-number> }
-                                                        @case (ConfigOptionType.Boolean) { <pngx-input-switch [formControlName]="option.key" [error]="errors[option.key]" [showUnsetNote]="true" [horizontal]="true" title="Enable" i18n-title></pngx-input-switch> }
-                                                        @case (ConfigOptionType.String) { <pngx-input-text [formControlName]="option.key" [error]="errors[option.key]"></pngx-input-text> }
-                                                        @case (ConfigOptionType.JSON) { <pngx-input-text [formControlName]="option.key" [error]="errors[option.key]"></pngx-input-text> }
-                                                        @case (ConfigOptionType.File) { <pngx-input-file [formControlName]="option.key" (upload)="uploadFile($event, option.key)" [error]="errors[option.key]"></pngx-input-file> }
-                                                        @case (ConfigOptionType.Password) { <pngx-input-password [formControlName]="option.key" [error]="errors[option.key]"></pngx-input-password> }
-                                                    }
-                                                </div>
-                                                @if (option.note) {
-                                                    <div class="form-text fst-italic">{{option.note}}</div>
+                        <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-2">
+                            @for (option of getCategoryOptions(category); track option.key) {
+                                <div class="col">
+                                    <div class="card bg-light">
+                                        <div class="card-body">
+                                            <div class="card-title d-flex align-items-center">
+                                                <h6 class="mb-0">
+                                                  {{option.title}}
+                                                </h6>
+                                                <a class="btn btn-sm btn-link" title="Read the documentation about this setting" i18n-title [href]="getDocsUrl(option.config_key)" target="_blank" referrerpolicy="no-referrer">
+                                                    <i-bs name="info-circle"></i-bs>
+                                                </a>
+                                                @if (isSet(option.key)) {
+                                                  <button type="button" class="btn btn-sm btn-link text-danger ms-auto pe-0" title="Reset" i18n-title (click)="resetOption(option.key)">
+                                                      <i-bs class="me-1" name="x"></i-bs><ng-container i18n>Reset</ng-container>
+                                                  </button>
                                                }
                                            </div>
+                                            <div class="mb-n3">
+                                                @switch (option.type) {
+                                                    @case (ConfigOptionType.Select) { <pngx-input-select [formControlName]="option.key" [error]="errors[option.key]" [items]="option.choices" [allowNull]="true"></pngx-input-select> }
+                                                    @case (ConfigOptionType.Number) { <pngx-input-number [formControlName]="option.key" [error]="errors[option.key]" [showAdd]="false"></pngx-input-number> }
+                                                    @case (ConfigOptionType.Boolean) { <pngx-input-switch [formControlName]="option.key" [error]="errors[option.key]" [showUnsetNote]="true" [horizontal]="true" title="Enable" i18n-title></pngx-input-switch> }
+                                                    @case (ConfigOptionType.String) { <pngx-input-text [formControlName]="option.key" [error]="errors[option.key]"></pngx-input-text> }
+                                                    @case (ConfigOptionType.JSON) { <pngx-input-text [formControlName]="option.key" [error]="errors[option.key]"></pngx-input-text> }
+                                                    @case (ConfigOptionType.File) { <pngx-input-file [formControlName]="option.key" (upload)="uploadFile($event, option.key)" [error]="errors[option.key]"></pngx-input-file> }
+                                                    @case (ConfigOptionType.Password) { <pngx-input-password [formControlName]="option.key" [error]="errors[option.key]"></pngx-input-password> }
+                                                }
+                                            </div>
+                                            @if (option.note) {
+                                                <div class="form-text fst-italic">{{option.note}}</div>
+                                            }
                                        </div>
                                    </div>
-                                }
-                            </div>
-                        }
+                                </div>
+                            }
+                        </div>
                    </div>
                </ng-template>
            </li>
@@ -8,11 +8,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgSelectModule } from '@ng-select/ng-select'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { of, throwError } from 'rxjs'
-import {
-  ConfigCategory,
-  ConfigSection,
-  OutputTypeConfig,
-} from 'src/app/data/paperless-config'
+import { OutputTypeConfig } from 'src/app/data/paperless-config'
 import { ConfigService } from 'src/app/services/config.service'
 import { SettingsService } from 'src/app/services/settings.service'
 import { ToastService } from 'src/app/services/toast.service'
@@ -162,24 +158,4 @@ describe('ConfigComponent', () => {
    component.resetOption('barcodes_enabled')
    expect(component.configForm.get('barcodes_enabled').value).toBeNull()
  })
-
-  it('should group options into sections within a category, or not', () => {
-    const sections = component.getCategorySections(ConfigCategory.OCR)
-    expect(sections).toEqual([null, ConfigSection.RemoteOCR])
-    expect(
-      component
-        .getCategoryOptions(ConfigCategory.OCR)
-        .map((option) => option.key)
-    ).toContain('output_type')
-    expect(
-      component
-        .getCategoryOptions(ConfigCategory.OCR, ConfigSection.RemoteOCR)
-        .map((option) => option.key)
-    ).toEqual([
-      'remote_ocr_engine',
-      'remote_ocr_api_key',
-      'remote_ocr_endpoint',
-      'remote_ocr_mode',
-    ])
-  })
 })
@@ -74,20 +74,8 @@ export class ConfigComponent
    return Object.values(ConfigCategory)
  }

-  getCategorySections(category: string): string[] {
-    return [
-      ...new Set(
-        PaperlessConfigOptions.filter((o) => o.category === category).map(
-          (o) => o.section ?? null // null means no section
-        )
-      ),
-    ]
-  }
-
-  getCategoryOptions(category: string, section: string = null): ConfigOption[] {
-    return PaperlessConfigOptions.filter(
-      (o) => o.category === category && (o.section ?? null) === section
-    )
+  getCategoryOptions(category: string): ConfigOption[] {
+    return PaperlessConfigOptions.filter((o) => o.category === category)
  }

  initialConfig: PaperlessConfig
@@ -89,7 +89,7 @@
        </div>
      </div>
      @if (filterText?.length) {
-        <button class="btn btn-link btn-sm px-2 position-absolute top-0 end-0 z-10" (click)="resetFilter()" aria-label="Clear search" i18n-aria-label>
+        <button class="btn btn-link btn-sm px-2 position-absolute top-0 end-0 z-10" (click)="resetFilter()">
          <i-bs width="1em" height="1em" name="x"></i-bs>
        </button>
      }
@@ -208,7 +208,7 @@
              </td>
            }
            <td class="d-lg-none">
-              <button class="btn btn-link" (click)="expandTask(task); $event.stopPropagation();" aria-label="View task details" i18n-aria-label>
+              <button class="btn btn-link" (click)="expandTask(task); $event.stopPropagation();">
                <i-bs width="1.2em" height="1.2em" name="info-circle"></i-bs>
              </button>
            </td>
@@ -576,7 +576,7 @@ describe('TasksComponent', () => {

    expect(dismissSpy).toHaveBeenCalledWith(new Set([tasks[0].id, tasks[1].id]))
    expect(toastSpy).toHaveBeenCalledWith('Error dismissing tasks', error)
-    expect(modal.componentInstance.buttonsEnabled()).toBe(true)
+    expect(modal.componentInstance.buttonsEnabled).toBe(true)
    expect(component.selectedTasks.size).toBe(0)
  })

@@ -642,7 +642,7 @@ describe('TasksComponent', () => {

    expect(dismissSpy).toHaveBeenCalled()
    expect(toastSpy).toHaveBeenCalledWith('Error dismissing tasks', error)
-    expect(modal.componentInstance.buttonsEnabled()).toBe(true)
+    expect(modal.componentInstance.buttonsEnabled).toBe(true)
  })

  it('should dismiss the currently visible scoped and filtered tasks', () => {
@@ -316,7 +316,7 @@ export class TasksComponent
      modal.componentInstance.btnClass = 'btn-warning'
      modal.componentInstance.btnCaption = $localize`Dismiss`
      modal.componentInstance.confirmClicked.pipe(first()).subscribe(() => {
-        modal.componentInstance.buttonsEnabled.set(false)
+        modal.componentInstance.buttonsEnabled = false
        modal.close()
        this.tasksService.dismissTasks(tasks).subscribe({
          next: () => {
@@ -324,7 +324,7 @@ export class TasksComponent
          },
          error: (e) => {
            this.toastService.showError($localize`Error dismissing tasks`, e)
-            modal.componentInstance.buttonsEnabled.set(true)
+            modal.componentInstance.buttonsEnabled = true
          },
        })
        this.clearSelection()
@@ -350,7 +350,7 @@ export class TasksComponent
    modal.componentInstance.btnClass = 'btn-warning'
    modal.componentInstance.btnCaption = $localize`Dismiss`
    modal.componentInstance.confirmClicked.pipe(first()).subscribe(() => {
-      modal.componentInstance.buttonsEnabled.set(false)
+      modal.componentInstance.buttonsEnabled = false
      modal.close()
      this.tasksService.dismissAllTasks().subscribe({
        next: () => {
@@ -358,7 +358,7 @@ export class TasksComponent
        },
        error: (e) => {
          this.toastService.showError($localize`Error dismissing tasks`, e)
-          modal.componentInstance.buttonsEnabled.set(true)
+          modal.componentInstance.buttonsEnabled = true
        },
      })
      this.clearSelection()
@@ -18,11 +18,9 @@
    </button>
 </pngx-page-header>

-@if (totalDocuments() > 25) {
-    <div class="row mb-3">
-        <ngb-pagination class="col-auto" [pageSize]="25" [collectionSize]="totalDocuments()" [page]="page()" [maxSize]="5" (pageChange)="page.set($event); reload()" size="sm" aria-label="Pagination"></ngb-pagination>
-    </div>
-}
+<div class="row mb-3">
+    <ngb-pagination class="col-auto" [pageSize]="25" [collectionSize]="totalDocuments()" [page]="page()" [maxSize]="5" (pageChange)="page.set($event); reload()" size="sm" aria-label="Pagination"></ngb-pagination>
+</div>

 <div class="card border table-responsive mb-3">
    <table class="table table-striped align-middle shadow-sm mb-0">
@@ -66,7 +64,7 @@
                    <td scope="row">
                    <div class="btn-group d-block d-sm-none">
                        <div ngbDropdown container="body" class="d-inline-block">
-                        <button type="button" class="btn btn-link" id="actionsMenuMobile" (click)="$event.stopPropagation()" ngbDropdownToggle aria-label="Actions" i18n-aria-label>
+                        <button type="button" class="btn btn-link" id="actionsMenuMobile" (click)="$event.stopPropagation()" ngbDropdownToggle>
                            <i-bs name="three-dots-vertical"></i-bs>
                        </button>
                        <div ngbDropdownMenu aria-labelledby="actionsMenuMobile">
@@ -2,8 +2,3 @@
 .d-block.d-sm-none .dropdown-toggle::after {
  display: none;
 }
-
-tbody tr:last-child td,
-table:not(:has(tbody tr)) thead th {
-  border-bottom: none;
-}
@@ -82,7 +82,7 @@ export class TrashComponent
    modal.componentInstance.confirmClicked
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(() => {
-        modal.componentInstance.buttonsEnabled.set(false)
+        modal.componentInstance.buttonsEnabled = false
        this.trashService.emptyTrash([document.id]).subscribe({
          next: () => {
            this.toastService.showInfo(
@@ -146,7 +146,7 @@ export class UsersAndGroupsComponent
    modal.componentInstance.btnClass = 'btn-danger'
    modal.componentInstance.btnCaption = $localize`Proceed`
    modal.componentInstance.confirmClicked.subscribe(() => {
-      modal.componentInstance.buttonsEnabled.set(false)
+      modal.componentInstance.buttonsEnabled = false
      this.usersService.delete(user).subscribe({
        next: () => {
          modal.close()
@@ -199,7 +199,7 @@ export class UsersAndGroupsComponent
    modal.componentInstance.btnClass = 'btn-danger'
    modal.componentInstance.btnCaption = $localize`Proceed`
    modal.componentInstance.confirmClicked.subscribe(() => {
-      modal.componentInstance.buttonsEnabled.set(false)
+      modal.componentInstance.buttonsEnabled = false
      this.groupsService.delete(group).subscribe({
        next: () => {
          modal.close()
@@ -2,36 +2,29 @@
  <button class="navbar-toggler d-md-none collapsed border-0" type="button" data-toggle="collapse"
    data-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation"
    (click)="closeMobileSearch(); toggleMenuCollapsed()">
-    <i-bs width="1.5em" height="1.5em" name="list"></i-bs>
+    <span class="navbar-toggler-icon"></span>
  </button>
-  <a class="navbar-brand d-flex align-items-center me-0 ps-md-3 py-0 order-sm-0"
-    [ngClass]="{ 'slim': slimSidebarEnabled, '' : !slimSidebarEnabled }"
+  <a class="navbar-brand d-flex align-items-center me-0 px-3 py-3 order-sm-0"
+    [ngClass]="{ 'slim': slimSidebarEnabled, 'col-auto col-md-3 col-lg-2 col-xxxl-1' : !slimSidebarEnabled, 'py-3' : !customAppTitle?.length || slimSidebarEnabled, 'py-2': customAppTitle?.length }"
    routerLink="/dashboard"
    tourAnchor="tour.intro">
-    @if (!hasCustomBranding) {
-      <pngx-logo extra_classes="navbar-official-logo px-1" height="2.4rem"></pngx-logo>
-      <svg class="brand-mark brand-mark-slim d-none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000" width="1.5em" height="1.5em" fill="currentColor">
-        <path d="M341,949.1c-6.9-20.3-20.7-61.2-21.9-61-199.6-88.9-182.5-229.8-134.3-347.5,30,137.2,268.8,148.9,146.2,336-.9,2.2,10,27.8,19.5,51.3,22.7-51.9,58.6-115.5,55.8-120.8C178,398.7,724.9,299,807.1,18.5c83,251.5,53.1,659.8-377.4,814.9-2,1.4-63.5,148.6-66.9,150.2-.2-2.1-33.2,2.9-30.1-8.7,1.6-7,4.8-16.2,8.2-25.6h0v-.2h.1ZM323.1,846.2c48.3-71.9-12.7-120.8-56.9-152.2,81.2,107.4,66.4,120.8,56.9,152.2h0Z"/>
-      </svg>
-    } @else {
-      @if (customAppLogo) {
-        <img class="brand-logo" [src]="customAppLogo" alt="" />
-      } @else {
-        <svg class="brand-mark" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000" width="1.5em" height="1.5em" fill="currentColor">
-          <path d="M341,949.1c-6.9-20.3-20.7-61.2-21.9-61-199.6-88.9-182.5-229.8-134.3-347.5,30,137.2,268.8,148.9,146.2,336-.9,2.2,10,27.8,19.5,51.3,22.7-51.9,58.6-115.5,55.8-120.8C178,398.7,724.9,299,807.1,18.5c83,251.5,53.1,659.8-377.4,814.9-2,1.4-63.5,148.6-66.9,150.2-.2-2.1-33.2,2.9-30.1-8.7,1.6-7,4.8-16.2,8.2-25.6h0v-.2h.1ZM323.1,846.2c48.3-71.9-12.7-120.8-56.9-152.2,81.2,107.4,66.4,120.8,56.9,152.2h0Z"/>
-        </svg>
-      }
-      <div class="brand-copy ms-2 text-truncate" [class.d-md-none]="slimSidebarEnabled">
-        <span class="brand-title text-truncate">{{ appTitle }}</span>
-        @if (customAppTitle) {
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000" width="1.5em" height="1.5em" fill="currentColor">
+      <path d="M341,949.1c-6.9-20.3-20.7-61.2-21.9-61-199.6-88.9-182.5-229.8-134.3-347.5,30,137.2,268.8,148.9,146.2,336-.9,2.2,10,27.8,19.5,51.3,22.7-51.9,58.6-115.5,55.8-120.8C178,398.7,724.9,299,807.1,18.5c83,251.5,53.1,659.8-377.4,814.9-2,1.4-63.5,148.6-66.9,150.2-.2-2.1-33.2,2.9-30.1-8.7,1.6-7,4.8-16.2,8.2-25.6h0v-.2h.1ZM323.1,846.2c48.3-71.9-12.7-120.8-56.9-152.2,81.2,107.4,66.4,120.8,56.9,152.2h0Z"/>
+    </svg>
+    <div class="ms-2 ms-md-3 d-inline-block" [class.d-md-none]="slimSidebarEnabled">
+      @if (customAppTitle?.length) {
+        <div class="d-flex flex-column align-items-start custom-title">
+          <span class="title">{{customAppTitle}}</span>
          <span class="byline text-uppercase font-monospace" i18n>by Paperless-ngx</span>
-        }
-      </div>
-    }
+        </div>
+      } @else {
+        Paperless-ngx
+      }
+    </div>
  </a>
-  <div class="search-container flex-grow-1 py-2 pb-3 pb-sm-2 me-sm-auto order-3 order-sm-1"
+  <div class="search-container flex-grow-1 py-2 pb-3 pb-sm-2 px-3 ps-md-4 me-sm-auto order-3 order-sm-1"
    [class.mobile-hidden]="mobileSearchHidden()">
-    <div class="col-12 header-search mx-auto">
+    <div class="col-12 col-md-7">
      <pngx-global-search></pngx-global-search>
    </div>
  </div>
@@ -41,7 +34,7 @@
    }
    <pngx-toasts-dropdown></pngx-toasts-dropdown>
    <li ngbDropdown class="nav-item dropdown">
-      <button class="btn navbar-action border-0" id="userDropdown" ngbDropdownToggle aria-label="User menu" i18n-aria-label>
+      <button class="btn ps-1 border-0" id="userDropdown" ngbDropdownToggle>
        <i-bs width="1.3em" height="1.3em" name="person-circle"></i-bs>
        <span class="small ms-2 d-none d-sm-inline">
          {{this.settingsService.displayName}}
@@ -78,7 +71,7 @@
      [ngClass]="slimSidebarEnabled ? 'slim' : 'col-md-3 col-lg-2 col-xxxl-1'" [class.animating]="slimSidebarAnimating()"
      [ngbCollapse]="isMenuCollapsed()">
      @if (canSaveSettings) {
-        <button class="btn btn-sm btn-dark sidebar-slim-toggler" (click)="toggleSlimSidebar()" [aria-label]="slimSidebarEnabled ? 'Expand sidebar' : 'Collapse sidebar'" i18n-aria-label>
+        <button class="btn btn-sm btn-dark sidebar-slim-toggler" (click)="toggleSlimSidebar()">
          @if (slimSidebarEnabled) {
            <i-bs width="0.9em" height="0.9em" name="chevron-double-right"></i-bs>
          } @else {
@@ -86,20 +79,18 @@
          }
        </button>
      }
-      <div class="sidebar-sticky pt-3 pb-1 d-flex flex-column justify-space-around">
+      <div class="sidebar-sticky pt-3 d-flex flex-column justify-space-around">
        <ul class="nav flex-column">
          <li class="nav-item app-link">
            <a class="nav-link" routerLink="dashboard" routerLinkActive="active" (click)="closeMenu()"
-              ngbPopover="Dashboard" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
+              ngbPopover="Dashboard" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
              container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
              <i-bs class="me-2" name="house"></i-bs><span><ng-container i18n>Dashboard</ng-container></span>
            </a>
          </li>
          <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Document }">
-            <a class="nav-link" routerLink="documents" routerLinkActive="active"
-              [routerLinkActiveOptions]="{ paths: 'exact', queryParams: 'ignored', matrixParams: 'ignored', fragment: 'ignored' }"
-              (click)="closeMenu()"
-              ngbPopover="Documents" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
+            <a class="nav-link" routerLink="documents" routerLinkActive="active" (click)="closeMenu()"
+              ngbPopover="Documents" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
              container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
              <i-bs class="me-2" name="files"></i-bs><span><ng-container i18n>Documents</ng-container></span>
            </a>
@@ -118,7 +109,7 @@
                  (cdkDragEnded)="onDragEnd($event)">
                  <a class="nav-link" routerLink="view/{{view.id}}"
                    routerLinkActive="active" (click)="closeMenu()" [ngbPopover]="view.name"
-                    [disablePopover]="!slimSidebarPopoversEnabled" placement="end" container="body" triggers="mouseenter:mouseleave"
+                    [disablePopover]="!slimSidebarEnabled" placement="end" container="body" triggers="mouseenter:mouseleave"
                    popoverClass="popover-slim">
                    <i-bs class="me-2" [name]="view.icon || 'funnel'"></i-bs><span><div class="d-inline-flex view-name"><span class="overflow-hidden" [class.text-wrap]="!slimSidebarEnabled">{{view.name}}</span></div>
                        @if (showSidebarCounts && !slimSidebarEnabled) {
@@ -156,7 +147,7 @@
              <li class="nav-item w-100 app-link">
                <a class="nav-link app-link" [class.text-truncate]="!slimSidebarEnabled" routerLink="documents/{{d.id}}"
                  routerLinkActive="active" (click)="closeMenu()" [ngbPopover]="d.title | documentTitle"
-                  [disablePopover]="!slimSidebarPopoversEnabled" placement="end" container="body" triggers="mouseenter:mouseleave"
+                  [disablePopover]="!slimSidebarEnabled" placement="end" container="body" triggers="mouseenter:mouseleave"
                  popoverClass="popover-slim">
                  <i-bs class="me-2" name="file-text"></i-bs><span>{{d.title | documentTitle}}</span>
                  <span class="close flex-column justify-content-center"
@@ -168,12 +159,11 @@
            }
            @if (openDocuments.length >= 1) {
              <li class="nav-item w-100 app-link">
-                <button type="button" class="nav-link nav-link-action app-link w-100 text-start"
-                  [class.text-truncate]="!slimSidebarEnabled" (click)="closeAll()"
-                  ngbPopover="Close all" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
+                <a class="nav-link app-link" [class.text-truncate]="!slimSidebarEnabled" [routerLink]="[]" (click)="closeAll()"
+                  ngbPopover="Close all" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
                  container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                  <i-bs class="me-2" name="x"></i-bs><span><ng-container i18n>Close all</ng-container></span>
-                </button>
+                </a>
              </li>
            }
          </ul>
@@ -187,11 +177,10 @@
            @if (canManageAttributes) {
              <li class="nav-item app-link" tourAnchor="tour.tags">
                <div class="d-flex align-items-center attributes-row">
-                  <a class="nav-link flex-fill" routerLink="attributes" routerLinkActive="active"
-                    [routerLinkActiveOptions]="{ exact: !(slimSidebarEnabled || attributesSectionsCollapsed) }" (click)="closeMenu()"
-                    ngbPopover="Attributes" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
+                  <a class="nav-link flex-fill" routerLink="attributes" routerLinkActive="active" (click)="closeMenu()"
+                    ngbPopover="Attributes" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
                    container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
-                    <i-bs name="stack"></i-bs><span class="ms-2"><ng-container i18n>Attributes</ng-container></span>
+                    <i-bs class="me-2" name="stack"></i-bs><span><ng-container i18n>Attributes</ng-container></span>
                  </a>
                  @if (!slimSidebarEnabled && canSaveSettings) {
                    <button
@@ -206,32 +195,32 @@
                  }
                </div>
                <div
-                  class="attributes-submenu ms-3"
+                  class="attributes-submenu ms-2"
                  [ngbCollapse]="slimSidebarEnabled || attributesSectionsCollapsed"
                >
                  <ul class="nav flex-column">
                    <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Tag }">
-                      <a class="nav-link" routerLink="attributes/tags" routerLinkActive="active" (click)="closeMenu()">
+                      <a class="nav-link py-1" routerLink="attributes/tags" routerLinkActive="active" (click)="closeMenu()">
                        <i-bs class="me-2" name="tags"></i-bs><span><ng-container i18n>Tags</ng-container></span>
                      </a>
                    </li>
                    <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Correspondent }">
-                      <a class="nav-link" routerLink="attributes/correspondents" routerLinkActive="active" (click)="closeMenu()">
+                      <a class="nav-link py-1" routerLink="attributes/correspondents" routerLinkActive="active" (click)="closeMenu()">
                        <i-bs class="me-2" name="person"></i-bs><span><ng-container i18n>Correspondents</ng-container></span>
                      </a>
                    </li>
                    <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.DocumentType }">
-                      <a class="nav-link" routerLink="attributes/documenttypes" routerLinkActive="active" (click)="closeMenu()">
+                      <a class="nav-link py-1" routerLink="attributes/documenttypes" routerLinkActive="active" (click)="closeMenu()">
                        <i-bs class="me-2" name="hash"></i-bs><span><ng-container i18n>Document types</ng-container></span>
                      </a>
                    </li>
                    <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.StoragePath }">
-                      <a class="nav-link" routerLink="attributes/storagepaths" routerLinkActive="active" (click)="closeMenu()">
+                      <a class="nav-link py-1" routerLink="attributes/storagepaths" routerLinkActive="active" (click)="closeMenu()">
                        <i-bs class="me-2" name="folder"></i-bs><span><ng-container i18n>Storage paths</ng-container></span>
                      </a>
                    </li>
                    <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.CustomField }">
-                      <a class="nav-link" routerLink="attributes/customfields" routerLinkActive="active" (click)="closeMenu()">
+                      <a class="nav-link py-1" routerLink="attributes/customfields" routerLinkActive="active" (click)="closeMenu()">
                        <i-bs class="me-2" name="ui-radios"></i-bs><span><ng-container i18n>Custom fields</ng-container></span>
                      </a>
                    </li>
@@ -241,7 +230,7 @@
            }
            <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.SavedView }">
              <a class="nav-link" routerLink="savedviews" routerLinkActive="active" (click)="closeMenu()"
-                ngbPopover="Saved Views" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
+                ngbPopover="Saved Views" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
                container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                <i-bs class="me-2" name="window-stack"></i-bs><span><ng-container i18n>Saved Views</ng-container></span>
              </a>
@@ -250,7 +239,7 @@
              *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Workflow }"
              tourAnchor="tour.workflows">
              <a class="nav-link" routerLink="workflows" routerLinkActive="active" (click)="closeMenu()"
-                ngbPopover="Workflows" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
+                ngbPopover="Workflows" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
                container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                <i-bs class="me-2" name="boxes"></i-bs><span><ng-container i18n>Workflows</ng-container></span>
              </a>
@@ -258,14 +247,14 @@
            <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.MailAccount }"
              tourAnchor="tour.mail">
              <a class="nav-link" routerLink="mail" routerLinkActive="active" (click)="closeMenu()" ngbPopover="Mail"
-                i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end" container="body"
+                i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end" container="body"
                triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                <i-bs class="me-2" name="envelope"></i-bs><span><ng-container i18n>Mail</ng-container></span>
              </a>
            </li>
            <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.Document }">
              <a class="nav-link" routerLink="trash" routerLinkActive="active" (click)="closeMenu()" ngbPopover="Trash"
-                i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end" container="body"
+                i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end" container="body"
                triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                <i-bs class="me-2" name="trash"></i-bs><span><ng-container i18n>Trash</ng-container></span>
              </a>
@@ -281,21 +270,21 @@
            <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.UISettings }"
              tourAnchor="tour.settings">
              <a class="nav-link" routerLink="settings" routerLinkActive="active" (click)="closeMenu()"
-                ngbPopover="Settings" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
+                ngbPopover="Settings" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
                container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                <i-bs class="me-2" name="gear"></i-bs><span><ng-container i18n>Settings</ng-container></span>
              </a>
            </li>
            <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.AppConfig }">
              <a class="nav-link" routerLink="config" routerLinkActive="active" (click)="closeMenu()"
-                ngbPopover="Configuration" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
+                ngbPopover="Configuration" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
                container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                <i-bs class="me-2" name="sliders2-vertical"></i-bs><span><ng-container i18n>Configuration</ng-container></span>
              </a>
            </li>
            <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.User }">
              <a class="nav-link" routerLink="usersgroups" routerLinkActive="active" (click)="closeMenu()"
-                ngbPopover="Users & Groups" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
+                ngbPopover="Users & Groups" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
                container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                <i-bs class="me-2" name="people"></i-bs><span><ng-container i18n>Users & Groups</ng-container></span>
              </a>
@@ -304,7 +293,7 @@
              *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.PaperlessTask }"
              tourAnchor="tour.file-tasks">
              <a class="nav-link" routerLink="tasks" routerLinkActive="active" (click)="closeMenu()"
-                ngbPopover="Tasks" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
+                ngbPopover="Tasks" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
                container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                <i-bs class="me-2" name="list-task"></i-bs><span><ng-container i18n>Tasks</ng-container>@if (tasksService.needsAttentionTasks.length > 0) {
                  <span><span class="badge bg-danger ms-2 d-inline">{{tasksService.needsAttentionTasks.length}}</span></span>
@@ -317,26 +306,26 @@
            @if (permissionsService.isAdmin()) {
              <li class="nav-item app-link">
                <a class="nav-link" routerLink="logs" routerLinkActive="active" (click)="closeMenu()" ngbPopover="Logs"
-                  i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end" container="body"
+                  i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end" container="body"
                  triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                  <i-bs class="me-2" name="text-left"></i-bs><span><ng-container i18n>Logs</ng-container></span>
                </a>
              </li>
            }
            <li class="nav-item mt-2" tourAnchor="tour.outro">
-              <a class="text-muted small d-flex align-items-center flex-wrap text-decoration-none nav-anchor"
+              <a class="px-3 py-2 text-muted small d-flex align-items-center flex-wrap text-decoration-none"
                target="_blank" rel="noopener noreferrer" href="https://docs.paperless-ngx.com" ngbPopover="Documentation"
-                i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end" container="body"
+                i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end" container="body"
                triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                <i-bs class="d-flex me-2" name="question-circle"></i-bs><span><ng-container i18n>Documentation</ng-container></span>
              </a>
            </li>
            <li class="nav-item" [class.visually-hidden]="slimSidebarEnabled">
-              <div class="text-muted small d-flex align-items-center flex-wrap nav-label">
+              <div class="px-3 py-0 text-muted small d-flex align-items-center flex-wrap">
                <div class="me-3">
                  <a class="text-muted text-decoration-none" target="_blank" rel="noopener noreferrer"
                    href="https://github.com/paperless-ngx/paperless-ngx" ngbPopover="GitHub" i18n-ngbPopover
-                    [disablePopover]="!slimSidebarPopoversEnabled" placement="end" container="body"
+                    [disablePopover]="!slimSidebarEnabled" placement="end" container="body"
                    triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                    {{ versionString }}
                  </a>
@@ -374,7 +363,7 @@
                        </a>
                      }
                    } @else {
-                      <a  *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.UISettings }" class="small text-decoration-none" routerLink="/settings" fragment="update-checking" aria-label="Configure update checking" i18n-aria-label
+                      <a  *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.UISettings }" class="small text-decoration-none" routerLink="/settings" fragment="update-checking"
                        [ngbPopover]="updateCheckingNotEnabledPopContent" popoverClass="shadow" triggers="mouseenter"
                        container="body">
                        <i-bs width="1.2em" height="1.2em" name="info-circle"></i-bs>
@@ -7,8 +7,8 @@
  bottom: 0;
  left: 0;
  z-index: 995; /* Behind the navbar */
-  padding: 64px 0 0; /* Height of navbar */
-  border-right: 1px solid color-mix(in srgb, var(--bs-border-color) 65%, transparent);
+  padding: 50px 0 0; /* Height of navbar */
+  box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1);
  overflow-y: auto;
  --pngx-sidebar-width: 100%;
  max-width: var(--pngx-sidebar-width);
@@ -19,13 +19,8 @@
    height: 0.8em;
  }

-  .sidebar-heading,
-  .text-uppercase {
-    letter-spacing: 0.06em;
-  }
-
  .view-name {
-    max-width: calc(100% - 55px)
+    max-width: calc(100% - 50px)
  }

  .nav-group:not(:has(.app-link)) .sidebar-heading {
@@ -47,17 +42,16 @@
 }
@media (max-width: 767.98px) {
  .sidebar {
-    top: 4rem;
+    top: 3.5rem;
  }

  .search-container {
    max-height: 4.5rem;
-    overflow: visible;
+    overflow: hidden;
    transition: max-height .2s ease, opacity .2s ease, padding-top .2s ease, padding-bottom .2s ease;

    &.mobile-hidden {
      max-height: 0;
-      overflow: hidden;
      opacity: 0;
      padding-top: 0 !important;
      padding-bottom: 0 !important;
@@ -67,35 +61,16 @@
  main.mobile-search-hidden {
    padding-top: 56px;
  }
-
-  .navbar-toggler {
-    padding-left: calc(12px - (1.5em * 2.5 / 16));
-  }
-}
-
-.search-container {
-  padding-left: 1rem;
-  padding-right: 1rem;
-}
-
-// Below sm the search gets its own full-width row, so line it up with main's content edge
-@media (max-width: 575.98px) {
-  .search-container {
-    padding-left: 12px;
-    padding-right: 12px;
-  }
 }

 main {
  transition: all .2s ease;
-  padding-top: 118px;
-  background: var(--pngx-bg-darker);
-  min-height: 100vh;
+  padding-top: 110px;
 }

@media (min-width: 768px) {
  main {
-    padding-top: 64px;
+    padding-top: 56px;
  }
 }

@@ -105,16 +80,16 @@ main {

 .sidebar li.nav-item span,
 .sidebar .sidebar-heading span {
-  transition: opacity .1s ease;
+  transition: all .1s ease;
 }

@media(min-width: 768px) {
  .sidebar.slim {
-    max-width: 55px;
+    max-width: 50px;

    li.nav-item span.badge {
      display: inline-block;
-      margin-right: -4px;
+      margin-right: 2px;
    }
  }

@@ -158,19 +133,26 @@ main {
    }
  }

+  .sidebar.slim {
+    li.nav-item span.badge {
+      display: inline-block;
+      margin-right: 2px;
+    }
+  }
+
  .sidebar-slim-toggler {
    display: block;
    position: fixed;
    left: calc(var(--pngx-sidebar-width) - 12px);
-    bottom: 16px;
+    top: 60px;
    z-index: 996;
    --bs-btn-padding-x: 0.35rem;
    --bs-btn-padding-y: 0.125rem;
-    transition: left .2s ease;
+    transition: all .2s ease;
  }

  .sidebar.slim .sidebar-slim-toggler {
-    --pngx-sidebar-width: 56px !important;
+    --pngx-sidebar-width: 50px !important;
  }
 }

@@ -183,7 +165,7 @@ main {
  position: relative;
  top: 0;
  height: 100%;
-  padding: .75rem .5rem 1rem;
+  padding-top: 0.5rem;
  overflow-x: hidden;
  overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
  min-height: min-content;
@@ -198,14 +180,9 @@ main {
 .sidebar .nav-link {
  font-weight: 500;
  white-space: nowrap;
-  border-radius: .55rem;
-  margin: 1px 0;
-  padding: .55rem .7rem;
-  transition: color .15s ease-in-out, background-color .15s ease-in-out;

-  &:hover, &:focus {
+  &:hover, &.active, &:focus {
    color: var(--bs-primary);
-    background-color: color-mix(in srgb, var(--bs-primary) 8%, transparent);
  }

  &:focus-visible {
@@ -214,21 +191,7 @@ main {
  }

  &.active {
-    font-weight: 600;
-    color: var(--bs-primary);
-    background-color: color-mix(in srgb, var(--bs-primary) 13%, transparent);
-  }
-
-  &.nav-link-action {
-    color: var(--bs-secondary-color);
-    font-weight: 400;
-    background-color: transparent;
-
-    &:hover,
-    &:focus {
-      color: var(--bs-primary);
-      background-color: transparent;
-    }
+    font-weight: bold;
  }

  i-bs {
@@ -237,49 +200,9 @@ main {
  }
 }

-.sidebar .nav-anchor, .sidebar .nav-label {
-  padding: .25rem .7rem;
-}
-
-.attributes-row {
-  border-radius: .55rem;
-  margin: .1rem 0;
-  transition: color .15s ease-in-out, background-color .15s ease-in-out;
-
-  > .nav-link {
-    margin: 0;
-
-    &:hover,
-    &:focus,
-    &.active {
-      background-color: transparent;
-    }
-  }
-
-  &:hover,
-  &:has(> .nav-link:focus-visible) {
-    background-color: color-mix(in srgb, var(--bs-primary) 8%, transparent);
-  }
-
-  &:has(> .nav-link.active) {
-    background-color: color-mix(in srgb, var(--bs-primary) 13%, transparent);
-  }
-}
-
 .attributes-row .attributes-expand-btn {
  opacity: 0.2;
-  width: 1.75rem;
-  height: 1.75rem;
-  margin-right: .35rem !important;
-  border-radius: 50%;
-  box-shadow: none !important;
  transition: opacity 0.15s ease-in-out;
-
-  &:focus-visible {
-    outline: 2px solid color-mix(in srgb, var(--bs-primary) 55%, transparent);
-    outline-offset: 1px;
-    opacity: 1;
-  }
 }

 .attributes-row:hover .attributes-expand-btn {
@@ -287,10 +210,8 @@ main {
 }

 .sidebar-heading {
-  font-size: 0.68rem;
+  font-size: 0.75rem;
  text-transform: uppercase;
-  font-weight: 700;
-  opacity: .75;
 }

 .nav {
@@ -347,118 +268,16 @@ main {
 */

 .navbar-brand {
-  --pngx-navbar-brand-shadow-rgb: 0, 0, 0;
-  font-size: 1.0625rem;
-  min-height: 64px;
-  letter-spacing: -0.015em;
+  font-size: 1rem;

-  &:hover,
-  &:focus-visible {
-    ::ng-deep .navbar-official-logo,
-    .brand-mark,
-    .brand-logo {
-      filter: drop-shadow(0 2px 3px rgba(var(--pngx-navbar-brand-shadow-rgb), .5));
-    }
-  }
-
-  ::ng-deep .navbar-official-logo {
-    filter: drop-shadow(0 1px 2px rgba(var(--pngx-navbar-brand-shadow-rgb), .3));
-    transition: filter .15s ease-in-out;
-
-    @media screen and (max-width: 575.98px) {
-      max-height: 2rem;
-    }
-  }
-
-  .brand-mark {
-    width: 1.65rem;
-    height: 1.65rem;
-    flex: 0 0 auto;
-    transition: filter .15s ease-in-out;
-  }
-
-  .brand-copy {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    min-width: 0;
-    line-height: 1.1;
-    transition: transform .15s ease-in-out;
-  }
-
-  .brand-title {
-    font-weight: 600;
-    max-width: 100%;
-    min-width: 0;
+  .flex-column {
+    padding: 0.15rem 0;
  }

  .byline {
-    margin-top: .15rem;
-    font-size: .5rem;
-    font-weight: 500;
-    letter-spacing: .1rem;
-    opacity: .8;
+    font-size: 0.5rem;
+    letter-spacing: 0.1rem;
  }
-
-  .brand-logo {
-    width: auto;
-    height: 2.75rem;
-    max-width: 5rem;
-    flex: 0 0 auto;
-    object-fit: contain;
-    transition: filter .15s ease-in-out, transform .15s ease-in-out;
-  }
-
-}
-
-:host-context(.primary-light) .navbar-brand {
-  --pngx-navbar-brand-shadow-rgb: 255, 255, 255; // Light app color, use white shadow for dark text
-}
-
-:host ::ng-deep .navbar-official-logo {
-  .leaf {
-    fill: color-mix(in srgb, var(--pngx-primary-text-contrast) 85%, var(--bs-primary)) !important;
-  }
-
-  .text {
-    fill: var(--pngx-primary-text-contrast) !important;
-  }
-}
-
-.navbar {
-  min-height: 64px;
-  box-shadow: 0 1px 0 rgba(0, 0, 0, .12), 0 4px 18px rgba(0, 0, 0, .08) !important;
-}
-
-.navbar > ul {
-  align-items: center;
-  gap: .125rem;
-  padding-right: .5rem;
-}
-
-:host ::ng-deep .navbar-action {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  min-width: 2.5rem;
-  min-height: 2.5rem;
-  padding: .45rem .55rem;
-  border-radius: .6rem;
-  transition: background-color .15s ease-in-out, opacity .15s ease-in-out;
-
-  &:hover,
-  &:focus-visible {
-    background-color: rgba(0, 0, 0, .14);
-  }
-}
-
-#userDropdown {
-  padding-left: .75rem;
-}
-
-.header-search {
-  width: 100%;
-  max-width: 55rem;
 }

@media screen and (max-width: 575.98px) {
@@ -472,7 +291,6 @@ main {

  .navbar-toggler {
    grid-area: toggler;
-    color: var(--pngx-primary-text-contrast);
    text-align: left;
  }

@@ -508,44 +326,18 @@ main {
    grid-area: actions;
    justify-self: end;
    flex-wrap: nowrap;
-    gap: 0;
-    padding-right: .25rem;
-  }
-
-  :host ::ng-deep .navbar-action {
-    min-width: 2.25rem;
-    padding-right: .4rem;
-    padding-left: .4rem;
-  }
-
-  #userDropdown {
-    padding-right: .35rem;
-    padding-left: .45rem;
  }
 }

@media screen and (min-width: 768px) {
  .navbar-brand.slim {
-    max-width: 55px;
-
-    .brand-logo {
-      width: 1.65rem;
-      max-width: 1.65rem;
-    }
-
-    .brand-mark-slim {
-      display: block !important;
-    }
-  }
-
-  :host ::ng-deep .navbar-brand.slim .navbar-official-logo {
-    display: none;
+    max-width: 50px;
  }
 }

 :host ::ng-deep .dropdown.show .dropdown-toggle,
 :host ::ng-deep .dropdown-toggle:hover {
-  opacity: 1;
+  opacity: 0.7;
 }

 .dropdown-toggle::after {
@@ -45,7 +45,6 @@ import { TasksService } from 'src/app/services/tasks.service'
 import { ToastService } from 'src/app/services/toast.service'
 import { environment } from 'src/environments/environment'
 import { ChatComponent } from '../chat/chat/chat.component'
-import { LogoComponent } from '../common/logo/logo.component'
 import { ProfileEditDialogComponent } from '../common/profile-edit-dialog/profile-edit-dialog.component'
 import { DocumentDetailComponent } from '../document-detail/document-detail.component'
 import { ComponentWithPermissions } from '../with-permissions/with-permissions.component'
@@ -60,7 +59,6 @@ const SCROLL_THRESHOLD = 16
  styleUrls: ['./app-frame.component.scss'],
  imports: [
    GlobalSearchComponent,
-    LogoComponent,
    DocumentTitlePipe,
    IfPermissionsDirective,
    ToastsDropdownComponent,
@@ -192,34 +190,11 @@ export class AppFrameComponent
    return `${environment.appTitle} v${this.settingsService.get(SETTINGS_KEYS.VERSION)}${environment.tag === 'prod' ? '' : ` #${environment.tag}`}`
  }

-  get appTitle(): string {
-    this.settingsService.trackChanges()
-    return (
-      this.settingsService.get(SETTINGS_KEYS.APP_TITLE) || environment.appTitle
-    )
-  }
-
  get customAppTitle(): string {
    this.settingsService.trackChanges()
    return this.settingsService.get(SETTINGS_KEYS.APP_TITLE)
  }

-  get hasCustomBranding(): boolean {
-    this.settingsService.trackChanges()
-    return !!(
-      this.settingsService.get(SETTINGS_KEYS.APP_TITLE)?.length ||
-      this.settingsService.get(SETTINGS_KEYS.APP_LOGO)?.length
-    )
-  }
-
-  get customAppLogo(): string {
-    this.settingsService.trackChanges()
-    const logo = this.settingsService.get(SETTINGS_KEYS.APP_LOGO)
-    return logo?.length
-      ? environment.apiBaseUrl.replace(/\/api\/$/, logo)
-      : null
-  }
-
  get canSaveSettings(): boolean {
    return (
      this.permissionsService.currentUserCan(
@@ -278,10 +253,6 @@ export class AppFrameComponent
      })
  }

-  get slimSidebarPopoversEnabled(): boolean {
-    return this.slimSidebarEnabled && !this.isMobileViewport()
-  }
-
  get attributesSectionsCollapsed(): boolean {
    this.settingsService.trackChanges()
    return this.settingsService
@@ -4,12 +4,12 @@ form {
  > i-bs[name="search"] {
    position: absolute;
    left: 0.6rem;
-    top: .25rem;
+    top: .35rem;
    color: rgba(255, 255, 255, 0.6);

    @media screen and (min-width: 768px) {
      // adjust for smaller font size on non-mobile
-      top: .15rem;
+      top: 0.25rem;
    }
  }

@@ -37,9 +37,8 @@ form {
  }

  .form-control {
-    min-height: 2.25rem;
-    color: rgba(255, 255, 255, 0.55);
-    background-color: rgba(0, 0, 0, 0.16);
+    color: rgba(255, 255, 255, 0.3);
+    background-color: rgba(0, 0, 0, 0.15);
    padding-left: 1.8rem;
    border-color: rgba(255, 255, 255, 0.2);
    transition: all .3s ease, padding-left 0s ease, background-color 0s ease; // Safari requires all
@@ -53,7 +52,7 @@ form {
    }

    &:focus-within {
-      background-color: rgba(0, 0, 0, 0.26);
+      background-color: rgba(0, 0, 0, 0.3);
      color: var(--bs-light);
      flex-grow: 1;
      padding-left: 0.5rem;
@@ -1,9 +1,9 @@

-<li ngbDropdown class="nav-item position-relative" (openChange)="onOpenChange($event)">
+<li ngbDropdown class="nav-item mx-1" (openChange)="onOpenChange($event)">
  @if (toasts().length) {
-    <span class="notification-count badge rounded-pill z-3 pe-none bg-secondary position-absolute">{{ toasts().length }}</span>
+    <span class="badge rounded-pill z-3 pe-none bg-secondary me-2 position-absolute top-0 left-0">{{ toasts().length }}</span>
  }
-  <button class="btn navbar-action border-0" id="notificationsDropdown" ngbDropdownToggle aria-label="Notifications" i18n-aria-label>
+  <button class="btn border-0" id="notificationsDropdown" ngbDropdownToggle>
    <i-bs width="1.3em" height="1.3em" name="bell"></i-bs>
  </button>
  <div ngbDropdownMenu class="dropdown-menu-end shadow p-3" aria-labelledby="notificationsDropdown">
@@ -11,16 +11,6 @@
  display: none;
 }

-.notification-count {
-  top: -.2rem;
-  right: -.2rem;
-  min-width: 1.15rem;
-  height: 1.15rem;
-  padding: .18rem .32rem;
-  font-size: .68rem;
-  line-height: 1;
-}
-
 .dropdown-item {
  white-space: initial;
 }
@@ -1,6 +1,6 @@

-<li ngbDropdown class="nav-item" (openChange)="onOpenChange($event)">
-  <button class="btn navbar-action border-0" id="chatDropdown" ngbDropdownToggle aria-label="Chat" i18n-aria-label>
+<li ngbDropdown class="nav-item me-n2" (openChange)="onOpenChange($event)">
+  <button class="btn border-0" id="chatDropdown" ngbDropdownToggle>
    <i-bs width="1.3em" height="1.3em" name="chatSquareDots"></i-bs>
  </button>
  <div ngbDropdownMenu class="dropdown-menu-end shadow p-3" aria-labelledby="chatDropdown">
@@ -12,10 +12,10 @@
  }
 </div>
 <div class="modal-footer">
-  <button type="button" class="btn" [class]="cancelBtnClass" (click)="cancel()" [disabled]="!buttonsEnabled()">
+  <button type="button" class="btn" [class]="cancelBtnClass" (click)="cancel()" [disabled]="!buttonsEnabled">
        <span class="d-inline-block" style="padding-bottom: 1px;">{{cancelBtnCaption}}</span>
      </button>
-  <button type="button" class="btn" [class]="btnClass" (click)="confirm()" [disabled]="!confirmButtonEnabled || !buttonsEnabled()">
+  <button type="button" class="btn" [class]="btnClass" (click)="confirm()" [disabled]="!confirmButtonEnabled || !buttonsEnabled">
    <span>
      {{btnCaption}}
      <span class="visually-hidden">{{ seconds | number: '1.0-0' }} seconds</span>
@@ -25,7 +25,7 @@
    }
  </button>
  @if (alternativeBtnCaption) {
-    <button type="button" class="btn" [class]="alternativeBtnClass" (click)="alternative()" [disabled]="!alternativeButtonEnabled || !buttonsEnabled()">
+    <button type="button" class="btn" [class]="alternativeBtnClass" (click)="alternative()" [disabled]="!alternativeButtonEnabled || !buttonsEnabled">
      {{alternativeBtnCaption}}
    </button>
  }
@@ -64,22 +64,6 @@ describe('ConfirmDialogComponent', () => {
    expect(confirmSubjectResult).toBeTruthy()
  })

-  it('should re-render the buttons when they are toggled from outside', async () => {
-    const confirmButton: HTMLButtonElement =
-      fixture.nativeElement.querySelectorAll('.modal-footer button')[1]
-    expect(confirmButton.disabled).toBeFalsy()
-
-    // Deliberately no detectChanges: a request callback toggling this is all
-    // that happens, and nothing else schedules a render for the modal
-    component.buttonsEnabled.set(false)
-    await fixture.whenStable()
-    expect(confirmButton.disabled).toBeTruthy()
-
-    component.buttonsEnabled.set(true)
-    await fixture.whenStable()
-    expect(confirmButton.disabled).toBeFalsy()
-  })
-
  it('should support cancel & close modal', () => {
    let confirmSubjectResult
    const closeModalSpy = jest.spyOn(modal, 'close')
@@ -1,12 +1,5 @@
 import { DecimalPipe } from '@angular/common'
-import {
-  Component,
-  EventEmitter,
-  Input,
-  Output,
-  inject,
-  signal,
-} from '@angular/core'
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { Subject } from 'rxjs'
 import { LoadingComponentWithPermissions } from '../../loading-component/loading.component'
@@ -53,7 +46,8 @@ export class ConfirmDialogComponent extends LoadingComponentWithPermissions {
  @Input()
  cancelBtnCaption = $localize`Cancel`

-  readonly buttonsEnabled = signal(true)
+  @Input()
+  buttonsEnabled = true

  confirmButtonEnabled = true
  alternativeButtonEnabled = true
@@ -1,58 +0,0 @@
-<div class="modal-header">
-  <h4 class="modal-title" id="modal-basic-title">{{title}}</h4>
-  <button type="button" class="btn-close" aria-label="Close" (click)="cancel()"></button>
-</div>
-<div class="modal-body">
-  <p>{{message}}</p>
-  <div class="form-group">
-    <label class="form-label" for="rootDocumentID" i18n>Root document:</label>
-    <select id="rootDocumentID" class="form-select" [ngModel]="rootDocumentID()" (ngModelChange)="rootDocumentID.set($event)">
-      @for (document of documents(); track document.id) {
-        <option [ngValue]="document.id">{{document.title}}</option>
-      }
-    </select>
-  </div>
-  <div class="form-group mt-4">
-    <span class="form-label d-inline-block" i18n>Versions (oldest first):</span>
-    <ul class="list-group"
-        cdkDropList
-        [cdkDropListData]="versionDocumentIDs()"
-        (cdkDropListDropped)="onDrop($event)">
-      @for (documentID of versionDocumentIDs(); track documentID) {
-        @let document = getDocument(documentID);
-        @if (document) {
-          <li class="list-group-item d-flex align-items-center" cdkDrag>
-            <i-bs name="grip-vertical" class="me-2"></i-bs>
-            <div class="d-flex flex-column">
-              <div>
-                @if (document.correspondent) {
-                  <b>{{document.correspondent | correspondentName | async}}: </b>
-                }{{document.title}}
-              </div>
-              <small class="text-muted">
-                {{document.created | customDate:'mediumDate'}}
-                @if (document.page_count) {
-                  | {document.page_count, plural, =1 {One page} other {{{document.page_count}} pages}}
-                }
-              </small>
-            </div>
-            @if ($last) {
-              <span class="badge bg-primary ms-auto" i18n>Current version</span>
-            }
-          </li>
-        }
-      }
-    </ul>
-    @if (versionDocumentIDs().length > 1) {
-      <div class="form-text" i18n>Drag to reorder.</div>
-    }
-  </div>
-</div>
-<div class="modal-footer">
-  <button type="button" class="btn" [class]="cancelBtnClass" (click)="cancel()" [disabled]="!buttonsEnabled()">
-    <span class="d-inline-block" style="padding-bottom: 1px;">{{cancelBtnCaption}}</span>
-  </button>
-  <button type="button" class="btn" [class]="btnClass" (click)="confirm()" [disabled]="!confirmButtonEnabled || !buttonsEnabled()">
-    {{btnCaption}}
-  </button>
-</div>
@@ -1,3 +0,0 @@
-.list-group-item {
-    cursor: move;
-}
@@ -1,70 +0,0 @@
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
-import { provideHttpClientTesting } from '@angular/common/http/testing'
-import { ComponentFixture, TestBed } from '@angular/core/testing'
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
-import { of } from 'rxjs'
-import { DocumentService } from 'src/app/services/rest/document.service'
-import { MergeAsVersionsConfirmDialogComponent } from './merge-as-versions-confirm-dialog.component'
-
-describe('MergeAsVersionsConfirmDialogComponent', () => {
-  let component: MergeAsVersionsConfirmDialogComponent
-  let fixture: ComponentFixture<MergeAsVersionsConfirmDialogComponent>
-  let documentService: DocumentService
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [
-        NgxBootstrapIconsModule.pick(allIcons),
-        MergeAsVersionsConfirmDialogComponent,
-      ],
-      providers: [
-        NgbActiveModal,
-        provideHttpClient(withInterceptorsFromDi()),
-        provideHttpClientTesting(),
-      ],
-    }).compileComponents()
-
-    fixture = TestBed.createComponent(MergeAsVersionsConfirmDialogComponent)
-    documentService = TestBed.inject(DocumentService)
-    component = fixture.componentInstance
-    fixture.detectChanges()
-  })
-
-  it('should fetch selected documents', () => {
-    const documents = [
-      { id: 1, title: 'Document 1' },
-      { id: 2, title: 'Document 2' },
-    ]
-    jest.spyOn(documentService, 'getFew').mockReturnValue(
-      of({
-        all: [1, 2],
-        count: 2,
-        results: documents,
-      })
-    )
-    component.documentIDs.set([1, 2])
-
-    component.ngOnInit()
-
-    expect(component.documents()).toEqual(documents)
-    expect(documentService.getFew).toHaveBeenCalledWith([1, 2])
-  })
-
-  it('should exclude the root from the draggable documents', () => {
-    component.documentIDs.set([1, 2, 3])
-    component.rootDocumentID.set(2)
-
-    expect(component.versionDocumentIDs()).toEqual([1, 3])
-  })
-
-  it('should move draggable documents while keeping the root fixed', () => {
-    component.documentIDs.set([1, 2, 3])
-    component.rootDocumentID.set(1)
-
-    component.onDrop({ previousIndex: 1, currentIndex: 0 } as any)
-
-    expect(component.documentIDs()).toEqual([1, 3, 2])
-    expect(component.versionDocumentIDs()).toEqual([3, 2])
-  })
-})
@@ -1,70 +0,0 @@
-import {
-  CdkDragDrop,
-  DragDropModule,
-  moveItemInArray,
-} from '@angular/cdk/drag-drop'
-import { AsyncPipe } from '@angular/common'
-import { Component, OnInit, computed, inject, signal } from '@angular/core'
-import { FormsModule } from '@angular/forms'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { takeUntil } from 'rxjs'
-import { Document } from 'src/app/data/document'
-import { CorrespondentNamePipe } from 'src/app/pipes/correspondent-name.pipe'
-import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
-import { DocumentService } from 'src/app/services/rest/document.service'
-import { ConfirmDialogComponent } from '../confirm-dialog.component'
-
-@Component({
-  selector: 'pngx-merge-as-versions-confirm-dialog',
-  templateUrl: './merge-as-versions-confirm-dialog.component.html',
-  styleUrl: './merge-as-versions-confirm-dialog.component.scss',
-  imports: [
-    AsyncPipe,
-    CorrespondentNamePipe,
-    CustomDatePipe,
-    DragDropModule,
-    FormsModule,
-    NgxBootstrapIconsModule,
-  ],
-})
-export class MergeAsVersionsConfirmDialogComponent
-  extends ConfirmDialogComponent
-  implements OnInit
-{
-  private readonly documentService = inject(DocumentService)
-
-  readonly documentIDs = signal<number[]>([])
-  readonly documents = signal<Document[]>([])
-  readonly rootDocumentID = signal(-1)
-  readonly versionDocumentIDs = computed(() =>
-    this.documentIDs().filter(
-      (documentID) => documentID !== this.rootDocumentID()
-    )
-  )
-
-  ngOnInit() {
-    this.documentService
-      .getFew(this.documentIDs())
-      .pipe(takeUntil(this.unsubscribeNotifier))
-      .subscribe((response) => this.documents.set(response.results))
-  }
-
-  onDrop(event: CdkDragDrop<number[]>) {
-    const versionDocumentIDs = this.versionDocumentIDs().concat()
-    moveItemInArray(versionDocumentIDs, event.previousIndex, event.currentIndex)
-
-    // The root keeps its place in the list, only the versions move around it
-    let versionIndex = 0
-    this.documentIDs.update((documentIDs) =>
-      documentIDs.map((documentID) =>
-        documentID === this.rootDocumentID()
-          ? documentID
-          : versionDocumentIDs[versionIndex++]
-      )
-    )
-  }
-
-  getDocument(documentID: number): Document | undefined {
-    return this.documents().find((document) => document.id === documentID)
-  }
-}
@@ -36,7 +36,7 @@
        </div>
    <div class="form-group mt-4">
        <label class="form-label" for="metadataDocumentID" i18n>Use metadata from:</label>
-        <select id="metadataDocumentID" class="form-select" [ngModel]="metadataDocumentID()" (ngModelChange)="metadataDocumentID.set($event)">
+        <select class="form-select" [ngModel]="metadataDocumentID()" (ngModelChange)="metadataDocumentID.set($event)">
            <option [ngValue]="-1" i18n>Regenerate all metadata</option>
            @for (document of documents(); track document.id) {
              <option [ngValue]="document.id">{{document.title}}</option>
@@ -56,10 +56,10 @@
    }
 </div>
 <div class="modal-footer">
-    <button type="button" class="btn" [class]="cancelBtnClass" (click)="cancel()" [disabled]="!buttonsEnabled()">
+    <button type="button" class="btn" [class]="cancelBtnClass" (click)="cancel()" [disabled]="!buttonsEnabled">
        <span class="d-inline-block" style="padding-bottom: 1px;">{{cancelBtnCaption}}</span>
    </button>
-    <button type="button" class="btn" [class]="btnClass" (click)="confirm()" [disabled]="!confirmButtonEnabled || !buttonsEnabled()">
+    <button type="button" class="btn" [class]="btnClass" (click)="confirm()" [disabled]="!confirmButtonEnabled || !buttonsEnabled">
        {{btnCaption}}
    </button>
 </div>
@@ -57,7 +57,7 @@
    class="btn"
    [class]="cancelBtnClass"
    (click)="cancel()"
-    [disabled]="!buttonsEnabled()"
+    [disabled]="!buttonsEnabled"
  >
    <span class="d-inline-block" style="padding-bottom: 1px;">
      {{cancelBtnCaption}}
@@ -68,7 +68,7 @@
    class="btn"
    [class]="btnClass"
    (click)="confirm()"
-    [disabled]="!confirmButtonEnabled || !buttonsEnabled()"
+    [disabled]="!confirmButtonEnabled || !buttonsEnabled"
  >
    {{btnCaption}}
  </button>
@@ -1,28 +0,0 @@
-<div class="modal-header">
-  <h4 class="modal-title" id="modal-basic-title">{{title}}</h4>
-  <button type="button" class="btn-close" aria-label="Close" (click)="cancel()">
-  </button>
-</div>
-<div class="modal-body">
-  @if (messageBold) {
-    <p class="text-break"><b>{{messageBold}}</b></p>
-  }
-  @if (message) {
-    <p class="mb-0 text-break" [innerHTML]="message"></p>
-  }
-  @if (showRemoteOcr) {
-    <div class="form-check mt-3">
-      <input class="form-check-input" type="checkbox" id="reprocessRemoteOcr" [(ngModel)]="remoteOcr" />
-      <label class="form-check-label" for="reprocessRemoteOcr" i18n>Use remote OCR</label>
-      <div class="form-text" i18n>Sends the document to the configured remote OCR service, which may incur costs.</div>
-    </div>
-  }
-</div>
-<div class="modal-footer">
-  <button type="button" class="btn" [class]="cancelBtnClass" (click)="cancel()" [disabled]="!buttonsEnabled">
-    <span class="d-inline-block" style="padding-bottom: 1px;">{{cancelBtnCaption}}</span>
-  </button>
-  <button type="button" class="btn" [class]="btnClass" (click)="confirm()" [disabled]="!confirmButtonEnabled || !buttonsEnabled">
-    {{btnCaption}}
-  </button>
-</div>
@@ -1,72 +0,0 @@
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
-import { provideHttpClientTesting } from '@angular/common/http/testing'
-import { ComponentFixture, TestBed } from '@angular/core/testing'
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
-import { RemoteOCRModeConfig } from 'src/app/data/paperless-config'
-import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
-import { SettingsService } from 'src/app/services/settings.service'
-import { ReprocessConfirmDialogComponent } from './reprocess-confirm-dialog.component'
-
-describe('ReprocessConfirmDialogComponent', () => {
-  let component: ReprocessConfirmDialogComponent
-  let fixture: ComponentFixture<ReprocessConfirmDialogComponent>
-  let settingsService: SettingsService
-
-  const createComponent = (configured: boolean, mode: string) => {
-    settingsService.set(SETTINGS_KEYS.REMOTE_OCR_CONFIGURED, configured)
-    settingsService.set(SETTINGS_KEYS.REMOTE_OCR_MODE, mode)
-
-    fixture = TestBed.createComponent(ReprocessConfirmDialogComponent)
-    component = fixture.componentInstance
-    fixture.detectChanges()
-  }
-
-  beforeEach(async () => {
-    TestBed.configureTestingModule({
-      providers: [
-        NgbActiveModal,
-        provideHttpClient(withInterceptorsFromDi()),
-        provideHttpClientTesting(),
-      ],
-      imports: [ReprocessConfirmDialogComponent],
-    }).compileComponents()
-
-    settingsService = TestBed.inject(SettingsService)
-  })
-
-  it('should not request remote OCR by default', () => {
-    createComponent(true, RemoteOCRModeConfig.WORKFLOW_ONLY)
-
-    expect(component.remoteOcr).toBeFalsy()
-  })
-
-  it('should not offer remote OCR when no engine is configured', () => {
-    createComponent(false, RemoteOCRModeConfig.WORKFLOW_ONLY)
-
-    expect(component.showRemoteOcr).toBeFalsy()
-    expect(
-      fixture.nativeElement.querySelector('#reprocessRemoteOcr')
-    ).toBeNull()
-  })
-
-  it('should not offer remote OCR when it already handles every document', () => {
-    createComponent(true, RemoteOCRModeConfig.ALWAYS)
-
-    expect(component.showRemoteOcr).toBeFalsy()
-    expect(
-      fixture.nativeElement.querySelector('#reprocessRemoteOcr')
-    ).toBeNull()
-  })
-
-  it('should offer remote OCR when configured and selective', () => {
-    createComponent(true, RemoteOCRModeConfig.WORKFLOW_ONLY)
-
-    expect(component.showRemoteOcr).toBeTruthy()
-    const checkbox = fixture.nativeElement.querySelector('#reprocessRemoteOcr')
-    expect(checkbox).not.toBeNull()
-
-    checkbox.click()
-    fixture.detectChanges()
-    expect(component.remoteOcr).toBeTruthy()
-  })
-})
@@ -1,20 +0,0 @@
-import { Component, inject } from '@angular/core'
-import { FormsModule } from '@angular/forms'
-import { SettingsService } from 'src/app/services/settings.service'
-import { ConfirmDialogComponent } from '../confirm-dialog.component'
-
-@Component({
-  selector: 'pngx-reprocess-confirm-dialog',
-  templateUrl: './reprocess-confirm-dialog.component.html',
-  imports: [FormsModule],
-})
-export class ReprocessConfirmDialogComponent extends ConfirmDialogComponent {
-  private settings = inject(SettingsService)
-
-  remoteOcr: boolean = false
-
-  public get showRemoteOcr(): boolean {
-    // Hidden when it is not configured, or when it already handles every document anyway.
-    return this.settings.remoteOCRIsSelectable
-  }
-}
@@ -6,7 +6,7 @@
 <div class="modal-body">
    <div class="row">
        <div class="col-2 d-flex justify-content-end">
-            <button class="btn btn-secondary mt-auto" (click)="rotate(false)" aria-label="Rotate counterclockwise" i18n-aria-label>
+            <button class="btn btn-secondary mt-auto" (click)="rotate(false)">
                <i-bs name="arrow-counterclockwise"></i-bs>
            </button>
        </div>
@@ -16,7 +16,7 @@
            }
        </div>
        <div class="col-2 d-flex">
-            <button class="btn btn-secondary mt-auto" (click)="rotate()" aria-label="Rotate clockwise" i18n-aria-label>
+            <button class="btn btn-secondary mt-auto" (click)="rotate()">
                <i-bs name="arrow-clockwise"></i-bs>
            </button>
        </div>
@@ -34,10 +34,10 @@
          <p class="mb-0 small"><b>{{messageBold}}</b></p>
        }
    </div>
-    <button type="button" class="btn" [class]="cancelBtnClass" (click)="cancel()" [disabled]="!buttonsEnabled()">
+    <button type="button" class="btn" [class]="cancelBtnClass" (click)="cancel()" [disabled]="!buttonsEnabled">
        <span class="d-inline-block" style="padding-bottom: 1px;">{{cancelBtnCaption}}</span>
    </button>
-    <button type="button" class="btn" [class]="btnClass" (click)="confirm()" [disabled]="!confirmButtonEnabled || !buttonsEnabled() || degrees === 0">
+    <button type="button" class="btn" [class]="btnClass" (click)="confirm()" [disabled]="!confirmButtonEnabled || !buttonsEnabled || degrees === 0">
      {{btnCaption}}
      @if (!confirmButtonEnabled) {
          <ngb-progressbar style="height: 1px;" type="dark" [max]="secondsTotal" [value]="seconds"></ngb-progressbar>
@@ -1,5 +1,5 @@
 <div ngbDropdown #fieldDropdown="ngbDropdown" (openChange)="onOpenClose($event)" [popperOptions]="popperOptions">
-    <button type="button" class="btn btn-sm btn-outline-primary" id="customFieldsDropdown" [disabled]="disabled" ngbDropdownToggle aria-label="Custom Fields" i18n-aria-label>
+    <button type="button" class="btn btn-sm btn-outline-primary" id="customFieldsDropdown" [disabled]="disabled" ngbDropdownToggle>
      <i-bs name="ui-radios"></i-bs><div class="d-none d-lg-inline ms-1"><ng-container i18n>Custom Fields</ng-container></div>
    </button>
    <div ngbDropdownMenu aria-labelledby="customFieldsDropdown" class="shadow custom-fields-dropdown">
@@ -1,6 +1,6 @@
@if (useDropdown) {
  <div class="btn-group w-100" role="group" ngbDropdown #dropdown="ngbDropdown" (openChange)="onOpenChange($event)" [popperOptions]="popperOptions">
-    <button class="btn btn-sm btn-outline-primary" id="dropdown_toggle" ngbDropdownToggle [disabled]="disabled" [aria-label]="title">
+    <button class="btn btn-sm btn-outline-primary" id="dropdown_toggle" ngbDropdownToggle [disabled]="disabled">
      <i-bs name="{{icon}}"></i-bs><div class="d-none d-sm-inline ms-1">{{title}}</div>
      @if (isActive) {
        <pngx-clearable-badge [selected]="isActive" (cleared)="reset()"></pngx-clearable-badge>
@@ -38,7 +38,7 @@
      ngbDatepicker
      #d="ngbDatepicker"
      [footerTemplate]="datePickerFooterTemplate" />
-    <button class="btn btn-sm btn-outline-secondary rounded-end" (click)="d.toggle()" type="button" aria-label="Open date picker" i18n-aria-label>
+    <button class="btn btn-sm btn-outline-secondary rounded-end" (click)="d.toggle()" type="button">
      <i-bs name="calendar-event"></i-bs>
    </button>
    <ng-template #datePickerFooterTemplate>
@@ -143,7 +143,7 @@
        <input class="w-25 form-control rounded-end" type="text" [(ngModel)]="atom.value" [disabled]="disabled">
      }
    }
-    <button class="btn btn-link btn-sm text-danger pe-0" type="button" (click)="removeElement(atom)" [disabled]="disabled" aria-label="Remove query" i18n-aria-label>
+    <button class="btn btn-link btn-sm text-danger pe-0" type="button" (click)="removeElement(atom)" [disabled]="disabled">
      <i-bs name="x-circle"></i-bs>
    </button>
  </div>
@@ -185,7 +185,7 @@
        <i-bs name="braces"></i-bs>
      </button>
      @if (expression.depth > 0) {
-        <button type="button" class="btn btn-sm btn-outline-secondary text-danger" (click)="removeElement(expression)" [disabled]="disabled" aria-label="Remove expression" i18n-aria-label>
+        <button type="button" class="btn btn-sm btn-outline-secondary text-danger" (click)="removeElement(expression)" [disabled]="disabled">
          <i-bs name="x-circle"></i-bs>
        </button>
      }
@@ -1,5 +1,5 @@
 <div class="btn-group w-100" ngbDropdown role="group" [popperOptions]="popperOptions" [placement]="placement">
-  <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="createdDateTo || createdDateFrom ? 'btn-primary' : 'btn-outline-primary'" [disabled]="disabled" [aria-label]="title">
+  <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="createdDateTo || createdDateFrom ? 'btn-primary' : 'btn-outline-primary'" [disabled]="disabled">
    <i-bs width="1em" height="1em" name="calendar-event-fill"></i-bs><div class="d-none d-sm-inline ms-1">{{title}}</div>
    <pngx-clearable-badge [selected]="isActive" (cleared)="reset()"></pngx-clearable-badge><span class="visually-hidden">selected</span>
  </button>
@@ -9,7 +9,7 @@
      <div class="list-group-item d-flex p-2 select-item" role="menuitem">
        <div class="selected-icon">
          @if (createdRelativeDate) {
-            <a class="text-light focus-variants" href="javascript:void(0)" (click)="clearCreatedRelativeDate()" aria-label="Clear created relative date" i18n-aria-label>
+            <a class="text-light focus-variants" href="javascript:void(0)" (click)="clearCreatedRelativeDate()">
              <i-bs width="1em" height="1em" name="check" class="variant-unfocused text-dark"></i-bs>
              <i-bs width="1em" height="1em" name="x" class="variant-focused text-primary"></i-bs>
            </a>
@@ -33,7 +33,7 @@
      <div class="list-group-item d-flex p-2" role="menuitem">
        <div class="selected-icon">
          @if (createdDateFrom) {
-            <a class="text-light focus-variants" href="javascript:void(0)" (click)="clearCreatedFrom()" aria-label="Clear created from date" i18n-aria-label>
+            <a class="text-light focus-variants" href="javascript:void(0)" (click)="clearCreatedFrom()">
              <i-bs width="1em" height="1em" name="check" class="variant-unfocused"></i-bs>
              <i-bs width="1em" height="1em" name="x" class="variant-focused text-primary"></i-bs>
            </a>
@@ -43,7 +43,7 @@
          <span class="input-group-text w-25 small text-muted" i18n>From</span>
          <input class="form-control small" [placeholder]="datePlaceHolder" (dateSelect)="onChangeDebounce()" (change)="onChangeDebounce()" (keypress)="onKeyPress($event)"
            maxlength="10" [(ngModel)]="createdDateFrom" ngbDatepicker #createdDateFromPicker="ngbDatepicker" [footerTemplate]="createdFromFooterTemplate">
-          <button class="btn btn-outline-secondary" (click)="createdDateFromPicker.toggle()" type="button" aria-label="Open created from date picker" i18n-aria-label>
+          <button class="btn btn-outline-secondary" (click)="createdDateFromPicker.toggle()" type="button">
            <i-bs width="1em" height="1em" name="calendar"></i-bs>
          </button>
          <ng-template #createdFromFooterTemplate>
@@ -57,7 +57,7 @@
      <div class="list-group-item d-flex p-2" role="menuitem">
        <div class="selected-icon">
          @if (createdDateTo) {
-            <a class="text-light focus-variants" href="javascript:void(0)" (click)="clearCreatedTo()" aria-label="Clear created to date" i18n-aria-label>
+            <a class="text-light focus-variants" href="javascript:void(0)" (click)="clearCreatedTo()">
              <i-bs width="1em" height="1em" name="check" class="variant-unfocused"></i-bs>
              <i-bs width="1em" height="1em" name="x" class="variant-focused text-primary"></i-bs>
            </a>
@@ -67,7 +67,7 @@
          <span class="input-group-text w-25 small text-muted" i18n>To</span>
          <input class="form-control small" [placeholder]="datePlaceHolder" (dateSelect)="onChangeDebounce()" (change)="onChangeDebounce()" (keypress)="onKeyPress($event)"
            maxlength="10" [(ngModel)]="createdDateTo" ngbDatepicker #createdDateToPicker="ngbDatepicker" [footerTemplate]="createdToFooterTemplate">
-          <button class="btn btn-outline-secondary" (click)="createdDateToPicker.toggle()" type="button" aria-label="Open created to date picker" i18n-aria-label>
+          <button class="btn btn-outline-secondary" (click)="createdDateToPicker.toggle()" type="button">
            <i-bs width="1em" height="1em" name="calendar"></i-bs>
          </button>
          <ng-template #createdToFooterTemplate>
@@ -85,7 +85,7 @@
      <div class="list-group-item d-flex p-2 select-item" role="menuitem">
        <div class="selected-icon">
          @if (addedRelativeDate) {
-            <a class="text-light focus-variants" href="javascript:void(0)" (click)="clearAddedRelativeDate()" aria-label="Clear added relative date" i18n-aria-label>
+            <a class="text-light focus-variants" href="javascript:void(0)" (click)="clearAddedRelativeDate()">
              <i-bs width="1em" height="1em" name="check" class="variant-unfocused text-dark"></i-bs>
              <i-bs width="1em" height="1em" name="x" class="variant-focused text-primary"></i-bs>
            </a>
@@ -109,7 +109,7 @@
      <div class="list-group-item d-flex p-2" role="menuitem">
        <div class="selected-icon">
          @if (addedDateFrom) {
-            <a class="text-light focus-variants" href="javascript:void(0)" (click)="clearAddedFrom()" aria-label="Clear added from date" i18n-aria-label>
+            <a class="text-light focus-variants" href="javascript:void(0)" (click)="clearAddedFrom()">
              <i-bs width="1em" height="1em" name="check" class="variant-unfocused"></i-bs>
              <i-bs width="1em" height="1em" name="x" class="variant-focused text-primary"></i-bs>
            </a>
@@ -119,7 +119,7 @@
          <span class="input-group-text w-25 small text-muted" i18n>From</span>
          <input class="form-control small" [placeholder]="datePlaceHolder" (dateSelect)="onChangeDebounce()" (change)="onChangeDebounce()" (keypress)="onKeyPress($event)"
            maxlength="10" [(ngModel)]="addedDateFrom" ngbDatepicker #addedDateFromPicker="ngbDatepicker" [footerTemplate]="addedFromFooterTemplate">
-          <button class="btn btn-outline-secondary" (click)="addedDateFromPicker.toggle()" type="button" aria-label="Open added from date picker" i18n-aria-label>
+          <button class="btn btn-outline-secondary" (click)="addedDateFromPicker.toggle()" type="button">
            <i-bs width="1em" height="1em" name="calendar"></i-bs>
          </button>
          <ng-template #addedFromFooterTemplate>
@@ -133,7 +133,7 @@
      <div class="list-group-item d-flex p-2" role="menuitem">
        <div class="selected-icon">
          @if (addedDateTo) {
-            <a class="text-light focus-variants" href="javascript:void(0)" (click)="clearAddedTo()" aria-label="Clear added to date" i18n-aria-label>
+            <a class="text-light focus-variants" href="javascript:void(0)" (click)="clearAddedTo()">
              <i-bs width="1em" height="1em" name="check" class="variant-unfocused"></i-bs>
              <i-bs width="1em" height="1em" name="x" class="variant-focused text-primary"></i-bs>
            </a>
@@ -143,7 +143,7 @@
          <span class="input-group-text w-25 small text-muted" i18n>To</span>
          <input class="form-control small" [placeholder]="datePlaceHolder" (dateSelect)="onChangeDebounce()" (change)="onChangeDebounce()" (keypress)="onKeyPress($event)"
            maxlength="10" [(ngModel)]="addedDateTo" ngbDatepicker #addedDateToPicker="ngbDatepicker" [footerTemplate]="addedToFooterTemplate">
-          <button class="btn btn-outline-secondary" (click)="addedDateToPicker.toggle()" type="button" aria-label="Open added to date picker" i18n-aria-label>
+          <button class="btn btn-outline-secondary" (click)="addedDateToPicker.toggle()" type="button">
            <i-bs width="1em" height="1em" name="calendar"></i-bs>
          </button>
          <ng-template #addedToFooterTemplate>
@@ -455,13 +455,6 @@
          </div>
        </div>
      }
-      @case (WorkflowActionType.RemoteOcr) {
-        <div class="row">
-          <div class="col">
-            <p class="text-muted small" i18n>The document will be sent to the configured remote OCR service. May incur costs.</p>
-          </div>
-        </div>
-      }
    }
  </div>
 </ng-template>
@@ -29,7 +29,6 @@ import {
  DocumentSource,
  WorkflowTriggerType,
 } from 'src/app/data/workflow-trigger'
-import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
 import { IfOwnerDirective } from 'src/app/directives/if-owner.directive'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service'
@@ -225,12 +224,7 @@ describe('WorkflowEditDialogComponent', () => {
    ).toEqual('Document Added')
    expect(component.getTriggerTypeOptionName(null)).toEqual('')
    expect(component.sourceOptions).toEqual(DOCUMENT_SOURCE_OPTIONS)
-    // Remote OCR is absent until the workflow has a consumption trigger
-    expect(component.actionTypeOptions).toEqual(
-      WORKFLOW_ACTION_OPTIONS.filter(
-        (a) => a.id !== WorkflowActionType.RemoteOcr
-      )
-    )
+    expect(component.actionTypeOptions).toEqual(WORKFLOW_ACTION_OPTIONS)
    expect(
      component.getActionTypeOptionName(WorkflowActionType.Assignment)
    ).toEqual('Assignment')
@@ -243,104 +237,7 @@ describe('WorkflowEditDialogComponent', () => {
    jest.spyOn(settingsService, 'get').mockReturnValue(false)
    component.ngOnInit()
    expect(component.actionTypeOptions).toEqual(
-      WORKFLOW_ACTION_OPTIONS.filter(
-        (a) =>
-          a.id !== WorkflowActionType.Email &&
-          a.id !== WorkflowActionType.RemoteOcr
-      )
-    )
-  })
-
-  it('should offer remote OCR only for consumption workflows', () => {
-    jest.spyOn(settingsService, 'get').mockReturnValue(true)
-
-    // A consumption trigger makes the action reachable
-    component.object = {
-      name: 'Workflow 1',
-      order: 0,
-      enabled: true,
-      triggers: [{ type: WorkflowTriggerType.Consumption }],
-      actions: [],
-    } as Workflow
-    component.ngOnInit()
-    expect(component.actionTypeOptions.map((a) => a.id)).toContain(
-      WorkflowActionType.RemoteOcr
-    )
-
-    // Any other trigger type runs after the document has been parsed
-    component.object = {
-      name: 'Workflow 2',
-      order: 0,
-      enabled: true,
-      triggers: [{ type: WorkflowTriggerType.DocumentAdded }],
-      actions: [],
-    } as Workflow
-    component.ngOnInit()
-    expect(component.actionTypeOptions.map((a) => a.id)).not.toContain(
-      WorkflowActionType.RemoteOcr
-    )
-  })
-
-  it('should offer remote OCR on a trigger added to a new workflow', () => {
-    jest.spyOn(settingsService, 'get').mockReturnValue(true)
-    component.ngOnInit()
-
-    // Nothing for the action to apply to yet
-    expect(component.actionTypeOptions.map((a) => a.id)).not.toContain(
-      WorkflowActionType.RemoteOcr
-    )
-
-    // addTrigger creates the form field with emitEvent false, so the options
-    // have to be computed on read rather than cached from valueChanges
-    component.addTrigger()
-    expect(component.actionTypeOptions.map((a) => a.id)).toContain(
-      WorkflowActionType.RemoteOcr
-    )
-
-    // Switching that trigger to a type that runs after parsing removes it
-    component.triggerFields
-      .at(0)
-      .get('type')
-      .setValue(WorkflowTriggerType.DocumentAdded)
-    expect(component.actionTypeOptions.map((a) => a.id)).not.toContain(
-      WorkflowActionType.RemoteOcr
-    )
-  })
-
-  it('should keep remote OCR listed when an action already uses it', () => {
-    jest.spyOn(settingsService, 'get').mockReturnValue(true)
-
-    // Otherwise changing the trigger would silently blank the selection
-    component.object = {
-      name: 'Workflow 1',
-      order: 0,
-      enabled: true,
-      triggers: [{ type: WorkflowTriggerType.DocumentAdded }],
-      actions: [{ type: WorkflowActionType.RemoteOcr }],
-    } as Workflow
-    component.ngOnInit()
-
-    expect(component.actionTypeOptions.map((a) => a.id)).toContain(
-      WorkflowActionType.RemoteOcr
-    )
-  })
-
-  it('should not offer remote OCR when no engine is configured', () => {
-    jest
-      .spyOn(settingsService, 'get')
-      .mockImplementation((key) => key !== SETTINGS_KEYS.REMOTE_OCR_CONFIGURED)
-
-    component.object = {
-      name: 'Workflow 1',
-      order: 0,
-      enabled: true,
-      triggers: [{ type: WorkflowTriggerType.Consumption }],
-      actions: [],
-    } as Workflow
-    component.ngOnInit()
-
-    expect(component.actionTypeOptions.map((a) => a.id)).not.toContain(
-      WorkflowActionType.RemoteOcr
+      WORKFLOW_ACTION_OPTIONS.filter((a) => a.id !== WorkflowActionType.Email)
    )
  })

@@ -148,10 +148,6 @@ export const WORKFLOW_ACTION_OPTIONS = [
    id: WorkflowActionType.MoveToTrash,
    name: $localize`Move to trash`,
  },
-  {
-    id: WorkflowActionType.RemoteOcr,
-    name: $localize`Remote OCR`,
-  },
 ]

 export enum TriggerFilterType {
@@ -508,6 +504,8 @@ export class WorkflowEditDialogComponent

  expandedItem: number = null

+  readonly allowedActionTypes = signal([])
+
  private readonly triggerFilterOptionsMap = new WeakMap<
    FormArray,
    TriggerFilterOption[]
@@ -550,40 +548,13 @@ export class WorkflowEditDialogComponent
      this.checkRemovalActionFields.bind(this)
    )
    this.checkRemovalActionFields(this.objectForm.value)
-  }
-
-  private allowedActionTypes: typeof WORKFLOW_ACTION_OPTIONS = null
-
-  private getAllowedActionTypes() {
-    let allowed = WORKFLOW_ACTION_OPTIONS
-
-    if (!this.settingsService.get(SETTINGS_KEYS.EMAIL_ENABLED)) {
-      allowed = allowed.filter((a) => a.id !== WorkflowActionType.Email)
-    }
-
-    // Remote OCR is decided before the document is parsed, so it is only
-    // offered for workflows that run at consumption.
-    const formWorkflow: Workflow = this.objectForm?.value
-    const remoteOcrUsable =
-      this.settingsService.get(SETTINGS_KEYS.REMOTE_OCR_CONFIGURED) &&
-      (formWorkflow?.triggers?.some(
-        (trigger) => trigger.type === WorkflowTriggerType.Consumption
-      ) ||
-        formWorkflow?.actions?.some(
-          (action) => action.type === WorkflowActionType.RemoteOcr
-        ))
-    if (!remoteOcrUsable) {
-      allowed = allowed.filter((a) => a.id !== WorkflowActionType.RemoteOcr)
-    }
-
-    if (
-      this.allowedActionTypes?.length === allowed.length &&
-      this.allowedActionTypes.every((a, i) => a.id === allowed[i].id)
-    ) {
-      return this.allowedActionTypes
-    }
-    this.allowedActionTypes = allowed
-    return allowed
+    this.allowedActionTypes.set(
+      this.settingsService.get(SETTINGS_KEYS.EMAIL_ENABLED)
+        ? WORKFLOW_ACTION_OPTIONS
+        : WORKFLOW_ACTION_OPTIONS.filter(
+            (a) => a.id !== WorkflowActionType.Email
+          )
+    )
  }

  private checkRemovalActionFields(formWorkflow: Workflow) {
@@ -1308,8 +1279,7 @@ export class WorkflowEditDialogComponent

  get actionTypeOptions() {
    this.settingsService.trackChanges()
-    // Computed on read rather than cached
-    return this.getAllowedActionTypes()
+    return this.allowedActionTypes()
  }

  getActionTypeOptionName(type: WorkflowActionType): string {
@@ -1,5 +1,5 @@
-<div class="btn-group w-100" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #dropdown="ngbDropdown" (keydown)="listKeyDown($event)" [popperOptions]="popperOptions" [autoClose]="!creating()">
-  <button class="btn btn-sm" id="dropdown_{{name}}" ngbDropdownToggle [ngClass]="!editing && selectionModel.selectionSize() > 0 ? 'btn-primary' : 'btn-outline-primary'" [disabled]="disabled" [aria-label]="title">
+<div class="btn-group w-100" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #dropdown="ngbDropdown" (keydown)="listKeyDown($event)" [popperOptions]="popperOptions">
+  <button class="btn btn-sm" id="dropdown_{{name}}" ngbDropdownToggle [ngClass]="!editing && selectionModel.selectionSize() > 0 ? 'btn-primary' : 'btn-outline-primary'" [disabled]="disabled">
    <i-bs name="{{icon}}"></i-bs><div class="d-none d-sm-inline ms-1">{{title}}</div>
    @if (!editing && selectionModel.totalCount > 0) {
      <pngx-clearable-badge [number]="selectionModel.totalCount" [selected]="selectionModel.selectionSize() > 0" (cleared)="reset()"></pngx-clearable-badge>
@@ -49,7 +49,7 @@
        </cdk-virtual-scroll-viewport>
      }
      @if (editing) {
-        @if (filteredItems.length === 0 && createRef !== undefined && filterText?.length > 0) {
+        @if (filteredItems.length === 0 && createRef !== undefined) {
          <button class="list-group-item list-group-item-action bg-light" (click)="createClicked()" [disabled]="disabled">
            <small class="ms-2"><ng-container i18n>Create</ng-container> "{{filterText}}"</small>
            <i-bs width="1.5em" height="1em" name="plus"></i-bs>
@@ -62,7 +62,7 @@
          </button>
        }
      }
-      @if (extraButtonTitle && (showExtraButtonIfEmpty || filteredItems?.length > 0)) {
+      @if (extraButtonTitle) {
        <button class="list-group-item list-group-item-action bg-light d-flex align-items-center" (click)="extraButtonClicked($event)" [disabled]="disabled">
          <small class="ms-2 fw-bold">{{extraButtonTitle}}</small>
          <i-bs width="1.5em" height="1em" name="arrow-right"></i-bs>
@@ -3,7 +3,6 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
-import { NEVER, Subject } from 'rxjs'
 import { NEGATIVE_NULL_FILTER_VALUE } from 'src/app/data/filter-rule-type'
 import {
  DEFAULT_MATCHING_ALGORITHM,
@@ -49,7 +48,6 @@ const negativeNullItem = {

 let selectionModel: FilterableDropdownSelectionModel
 const wait = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
-const createModalRef = () => ({ closed: NEVER, dismissed: NEVER }) as any

 describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () => {
  let component: FilterableDropdownComponent
@@ -870,7 +868,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
    expect(getRootDocCount(rootWithoutCounts.id)).toEqual(0)
  })

-  it('should keep the dropdown open while the create modal is active', async () => {
+  it('should set support create, keep open model and call createRef method', async () => {
    component.selectionModel.items = items
    component.icon = 'tag-fill'
    component.selectionModel = selectionModel
@@ -884,44 +882,20 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
    fixture.detectChanges()

    component.filterText = 'Test Filter Text'
-    const modalClosed = new Subject<void>()
-    component.createRef = jest.fn(
-      () =>
-        ({
-          closed: modalClosed,
-          dismissed: NEVER,
-        }) as any
-    )
+    component.createRef = jest.fn()
    component.createClicked()
-    expect(component.creating()).toBeTruthy()
+    expect(component.creating).toBeTruthy()
    expect(component.createRef).toHaveBeenCalledWith('Test Filter Text')
-    fixture.detectChanges()
-    expect(component.dropdown.autoClose).toBeFalsy()
-
-    document.body.dispatchEvent(new MouseEvent('mousedown', { bubbles: true }))
-    document.body.dispatchEvent(new MouseEvent('mouseup', { bubbles: true }))
-    await wait(10)
-    expect(component.dropdown.isOpen()).toBeTruthy()
-
-    // Also cover a close that was already scheduled before autoClose changed.
    const openSpy = jest.spyOn(component.dropdown, 'open')
    component.dropdownOpenChange(false)
    expect(openSpy).toHaveBeenCalled() // should keep open
-    component.dropdownOpenChange(false)
-    expect(openSpy).toHaveBeenCalledTimes(2) // modal interactions keep it open
-
-    modalClosed.next()
-    fixture.detectChanges()
-    expect(component.creating()).toBeFalsy()
-    expect(component.dropdown.autoClose).toBeTruthy()
-    expect(component.dropdown.isOpen()).toBeTruthy()
  })

  it('should call create on enter inside filter field if 0 items remain while editing', async () => {
    component.selectionModel.items = items
    component.icon = 'tag-fill'
    component.editing = true
-    component.createRef = jest.fn(createModalRef)
+    component.createRef = jest.fn()
    const createSpy = jest.spyOn(component, 'createClicked')
    expect(component.selectionModel.getSelectedItems()).toEqual([])
    fixture.nativeElement
@@ -937,25 +911,6 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
    expect(createSpy).toHaveBeenCalled()
  })

-  it('should only show create when a non-empty filter has no matches', () => {
-    component.selectionModel.items = []
-    component.icon = 'tag-fill'
-    component.editing = true
-    component.createRef = jest.fn(createModalRef)
-
-    fixture.detectChanges()
-    expect(fixture.nativeElement.textContent).not.toContain('Create')
-    component.listFilterEnter()
-    expect(component.createRef).not.toHaveBeenCalled()
-
-    const filterInput: HTMLInputElement =
-      fixture.nativeElement.querySelector('input[type="text"]')
-    filterInput.value = 'FooBar'
-    filterInput.dispatchEvent(new Event('input'))
-    fixture.detectChanges()
-    expect(fixture.nativeElement.textContent).toContain('Create "FooBar"')
-  })
-
  it('should exclude item and trigger change event', () => {
    const id = 1
    const state = ToggleableItemState.Selected
@@ -1015,18 +970,4 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
    expect(extraButtonClicked).toBeTruthy()
    expect(applied).toBeFalsy()
  })
-
-  it('should only show the extra button for an empty result when enabled', () => {
-    component.selectionModel.items = items
-    component.icon = 'tag-fill'
-    component.extraButtonTitle = 'Extra'
-    component.filterText = 'FooBar'
-
-    fixture.detectChanges()
-    expect(fixture.nativeElement.textContent).not.toContain('Extra')
-
-    fixture.componentRef.setInput('showExtraButtonIfEmpty', true)
-    fixture.detectChanges()
-    expect(fixture.nativeElement.textContent).toContain('Extra')
-  })
 })
@@ -15,13 +15,9 @@ import {
  signal,
 } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import {
-  NgbDropdown,
-  NgbDropdownModule,
-  NgbModalRef,
-} from '@ng-bootstrap/ng-bootstrap'
+import { NgbDropdown, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { Subject, filter, first, merge, takeUntil } from 'rxjs'
+import { Subject, filter, takeUntil } from 'rxjs'
 import { NEGATIVE_NULL_FILTER_VALUE } from 'src/app/data/filter-rule-type'
 import { MatchingModel } from 'src/app/data/matching-model'
 import { ObjectWithPermissions } from 'src/app/data/object-with-permissions'
@@ -763,7 +759,7 @@ export class FilterableDropdownComponent
  disabled = false

  @Input()
-  createRef: (name: string) => NgbModalRef
+  createRef: (name) => void

  @Input()
  set documentCounts(counts: SelectionDataItem[]) {
@@ -778,10 +774,7 @@ export class FilterableDropdownComponent
  @Input()
  extraButtonTitle: string

-  @Input()
-  showExtraButtonIfEmpty: boolean = false
-
-  readonly creating = signal(false)
+  creating: boolean = false

  @Output()
  apply = new EventEmitter<ChangedItems>()
@@ -858,18 +851,12 @@ export class FilterableDropdownComponent
  }

  createClicked() {
-    this.creating.set(true)
-    const modal = this.createRef(this.filterText)
-    merge(modal.closed, modal.dismissed)
-      .pipe(first(), takeUntil(this.unsubscribeNotifier))
-      .subscribe(() => this.creating.set(false))
+    this.creating = true
+    this.createRef(this.filterText)
  }

  dropdownOpenChange(open: boolean): void {
    if (open) {
-      // Dont let a create modal close this
-      if (this.creating()) return
-
      setTimeout(() => {
        this.listFilterTextInput?.nativeElement.focus()
        this.buttonsViewport?.checkViewportSize()
@@ -882,8 +869,9 @@ export class FilterableDropdownComponent
        this.editing && !this.selectionModel.manyToOne
      this.opened.next(this)
    } else {
-      if (this.creating()) {
+      if (this.creating) {
        this.dropdown?.open()
+        this.creating = false
      } else {
        this.filterText = ''
        if (this.applyOnClose && this.selectionModel.isDirty()) {
@@ -904,11 +892,7 @@ export class FilterableDropdownComponent
          this.dropdown.close()
        }
      }, 200)
-    } else if (
-      filtered.length == 0 &&
-      this.createRef &&
-      this.filterText?.length > 0
-    ) {
+    } else if (filtered.length == 0 && this.createRef) {
      this.createClicked()
    }
  }
@@ -4,7 +4,7 @@
  }

  <div class="input-group" [class.is-invalid]="error">
-    <button type="button" class="input-group-text" [style.background-color]="value" (click)="colorPicker.toggle()" aria-label="Open color picker" i18n-aria-label>&nbsp;&nbsp;&nbsp;</button>
+    <button type="button" class="input-group-text" [style.background-color]="value" (click)="colorPicker.toggle()">&nbsp;&nbsp;&nbsp;</button>

    <ng-template #popContent>
      <div style="min-width: 200px;" class="pb-3">
@@ -14,7 +14,7 @@

    <input #inputField class="form-control" [class.is-invalid]="error" [id]="inputId" [(ngModel)]="value" (change)="onChange(value)" [autoClose]="'outside'" [ngbPopover]="popContent" #colorPicker="ngbPopover" placement="bottom" popoverClass="shadow">

-    <button class="btn btn-outline-secondary" type="button" (click)="randomize()" aria-label="Choose a random color" i18n-aria-label>
+    <button class="btn btn-outline-secondary" type="button" (click)="randomize()">
      <i-bs name="dice5"></i-bs>
    </button>

@@ -74,7 +74,7 @@
          class="flex-grow-1"></pngx-input-textarea>
        }
      }
-      <button type="button" class="btn btn-link text-danger" (click)="removeSelectedField.next(fieldId)" aria-label="Remove custom field" i18n-aria-label>
+      <button type="button" class="btn btn-link text-danger" (click)="removeSelectedField.next(fieldId)">
        <i-bs name="trash"></i-bs>
      </button>
    </div>
@@ -13,7 +13,7 @@
          <input #inputField class="form-control" [class.is-invalid]="error" [placeholder]="placeholder" [id]="inputId" maxlength="10"
            (dateSelect)="onChange(value)" (change)="onChange(value)" (keypress)="onKeyPress($event)" (paste)="onPaste($event)"
            name="dp" [(ngModel)]="value" ngbDatepicker #datePicker="ngbDatepicker" #datePickerContent="ngModel" [disabled]="disabled" [footerTemplate]="datePickerFooterTemplate">
-          <button class="btn btn-outline-secondary calendar" (click)="datePicker.toggle()" type="button" [disabled]="disabled" aria-label="Open date picker" i18n-aria-label>
+          <button class="btn btn-outline-secondary calendar" (click)="datePicker.toggle()" type="button" [disabled]="disabled">
            <i-bs width="1.2em" height="1.2em" name="calendar"></i-bs>
          </button>
          <ng-template #datePickerFooterTemplate>
@@ -13,7 +13,7 @@
        <div class="input-group mb-3">
          <input type="text" class="form-control" [(ngModel)]="entry[0]" (change)="inputChange()" [disabled]="disabled" autocomplete="off">
          <input type="text" class="form-control" [(ngModel)]="entry[1]" (change)="inputChange()" [disabled]="disabled" autocomplete="off">
-          <button type="button" class="btn btn-outline-secondary" (click)="removeEntry(i)" aria-label="Remove entry" i18n-aria-label>
+          <button type="button" class="btn btn-outline-secondary" (click)="removeEntry(i)">
            <i-bs class="text-danger" name="trash"></i-bs>
          </button>
        </div>
@@ -50,7 +50,7 @@
          </ng-template>
        </ng-select>
        @if (allowCreateNew && !hideAddButton) {
-          <button class="btn btn-outline-secondary" type="button" (click)="addItem()" [disabled]="disabled" aria-label="Create new item" i18n-aria-label>
+          <button class="btn btn-outline-secondary" type="button" (click)="addItem()" [disabled]="disabled">
            <i-bs width="1.2em" height="1.2em" name="plus"></i-bs>
          </button>
        }
@@ -48,7 +48,7 @@
          </ng-template>
        </ng-select>
        @if (allowCreate && !hideAddButton) {
-          <button class="btn btn-outline-secondary" type="button" (click)="createTag(null, true)" [disabled]="disabled" aria-label="Create new tag" i18n-aria-label>
+          <button class="btn btn-outline-secondary" type="button" (click)="createTag(null, true)" [disabled]="disabled">
            <i-bs width="1.2em" height="1.2em" name="plus"></i-bs>
          </button>
        }
@@ -1,6 +1,6 @@
-<div class="row pt-3 pb-2 align-items-center">
+<div class="row pt-3 pb-3 pb-md-2 align-items-center">
  <div class="col-md text-truncate">
-    <h3 class="d-flex align-items-center mb-2 mb-md-1" style="line-height: 1.4">
+    <h3 class="d-flex align-items-center mb-1" style="line-height: 1.4">
      <span class="text-truncate">{{title()}}</span>
      @if (id()) {
        <span class="badge bg-primary text-primary-text-contrast ms-3 small fs-normal cursor-pointer" (click)="copyID()">
@@ -12,10 +12,10 @@
        </span>
      }
      @if (subTitle()) {
-        <span class="page-subtitle h6 mb-0 mt-1 fw-normal ms-md-3 text-truncate" style="line-height: 1.4">{{subTitle()}}</span>
+        <span class="h6 mb-0 mt-1 d-block d-md-inline fw-normal ms-md-3 text-truncate" style="line-height: 1.4">{{subTitle()}}</span>
      }
      @if (info()) {
-        <button class="btn btn-sm btn-link text-muted p-0 ms-2 p-md-2 ms-md-0" title="What's this?" i18n-title type="button" [ngbPopover]="infoPopover" [autoClose]="true">
+        <button class="btn btn-sm btn-link text-muted p-0 p-md-2" title="What's this?" i18n-title type="button" [ngbPopover]="infoPopover" [autoClose]="true">
          <i-bs name="question-circle"></i-bs>
        </button>
        <ng-template #infoPopover>
@@ -1,6 +1,5 @@
 h3 {
    min-height: calc(1.325rem + 0.9vw);
-    flex-wrap: wrap;

    .badge {
        font-size: 0.65rem;
@@ -8,25 +7,6 @@ h3 {
    }
 }

-// Drop the subtitle onto its own and shrink it
-@media (max-width: 767.98px) {
-    h3 > .page-subtitle {
-        flex: 0 0 100%;
-        margin-top: 0 !important;
-        font-size: .7rem;
-        line-height: 1.3 !important;
-    }
-}
-
-:host {
-  display: block;
-  margin-bottom: .35rem;
-}
-
-h3 > .h6 {
-  color: var(--bs-secondary-color);
-}
-
@media (min-width: 1200px) {
    h3 {
        min-height: 2.8rem;
@@ -100,7 +100,7 @@
      </div>
    }
    <div class="form-group ms-md-auto">
-      <button type="button" class="btn me-2" [class]="cancelBtnClass" (click)="cancel()" [disabled]="!buttonsEnabled()">{{ cancelBtnCaption }}</button>
+      <button type="button" class="btn me-2" [class]="cancelBtnClass" (click)="cancel()" [disabled]="!buttonsEnabled">{{ cancelBtnCaption }}</button>
      <button type="button" class="btn" [class]="btnClass" (click)="confirm()" [disabled]="pages.length === 0">{{ btnCaption }}</button>
    </div>
  </div>
@@ -1,5 +1,5 @@
 <div class="btn-group w-100" ngbDropdown role="group">
-  <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="isActive ? 'btn-primary' : 'btn-outline-primary'" [disabled]="disabled" [aria-label]="title">
+  <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="isActive ? 'btn-primary' : 'btn-outline-primary'" [disabled]="disabled">
    <i-bs name="person-fill-lock"></i-bs><div class="d-none d-sm-inline ms-1">{{title}}</div>
    <pngx-clearable-badge [selected]="isActive" (cleared)="reset()"></pngx-clearable-badge><span class="visually-hidden">selected</span>
  </button>
@@ -22,7 +22,7 @@
          }
        </div>
        <div class="me-1">
-          <small>{{ownerFilterLabel}}</small>
+          <small i18n>My documents</small>
        </div>
      </button>
      <button class="list-group-item list-group-item-action d-flex align-items-center p-2 border-top-0 border-start-0 border-end-0 border-bottom" role="menuitem" (click)="setFilter(OwnerFilterType.NOT_SELF)" [disabled]="disabled">
@@ -32,7 +32,7 @@
          }
        </div>
        <div class="me-1">
-          <small>{{ownerExclusionFilterLabel}}</small>
+          <small i18n>Shared with me</small>
        </div>
      </button>
      <button class="list-group-item list-group-item-action d-flex align-items-center p-2 border-top-0 border-start-0 border-end-0 border-bottom" role="menuitem" (click)="setFilter(OwnerFilterType.SHARED_BY_ME)" [disabled]="disabled">
@@ -42,7 +42,7 @@
          }
        </div>
        <div class="me-1">
-          <small>{{sharedByFilterLabel}}</small>
+          <small i18n>Shared by me</small>
        </div>
      </button>
      <button class="list-group-item list-group-item-action d-flex align-items-center p-2 border-top-0 border-start-0 border-end-0 border-bottom" role="menuitem" (click)="setFilter(OwnerFilterType.UNOWNED)" [disabled]="disabled">
@@ -94,58 +94,6 @@ describe('PermissionsFilterDropdownComponent', () => {
    expect(component.isActive).toBeTruthy()
  })

-  it('should describe concrete user filters honestly', () => {
-    component.selectionModel.ownerFilter = OwnerFilterType.SELF
-    component.selectionModel.userID = 1
-    expect(component.ownerFilterLabel).toEqual('Owned by user1')
-
-    component.selectionModel.ownerFilter = OwnerFilterType.NOT_SELF
-    component.selectionModel.excludeUsers = [1]
-    expect(component.ownerExclusionFilterLabel).toEqual('Not owned by user1')
-
-    component.selectionModel.ownerFilter = OwnerFilterType.SHARED_BY_ME
-    component.selectionModel.userID = 1
-    expect(component.sharedByFilterLabel).toEqual('Shared by user1')
-  })
-
-  it('should describe concrete filters when usernames are unavailable', () => {
-    component.selectionModel.ownerFilter = OwnerFilterType.SELF
-    component.selectionModel.userID = 99
-    expect(component.ownerFilterLabel).toEqual('Owned by another user')
-
-    component.selectionModel.ownerFilter = OwnerFilterType.NOT_SELF
-    component.selectionModel.excludeUsers = [99]
-    expect(component.ownerExclusionFilterLabel).toEqual(
-      'Not owned by another user'
-    )
-
-    component.selectionModel.excludeUsers = [98, 99]
-    expect(component.ownerExclusionFilterLabel).toEqual(
-      'Not owned by selected users'
-    )
-
-    component.selectionModel.ownerFilter = OwnerFilterType.SHARED_BY_ME
-    component.selectionModel.userID = 99
-    expect(component.sharedByFilterLabel).toEqual('Shared by another user')
-  })
-
-  it('should retain relative labels for filters bound to the current user', () => {
-    component.selectionModel.userID = currentUserID
-    expect(component.ownerFilterLabel).toEqual('My documents')
-    expect(component.sharedByFilterLabel).toEqual('Shared by me')
-
-    component.selectionModel.excludeUsers = [currentUserID]
-    expect(component.ownerExclusionFilterLabel).toEqual('Shared with me')
-  })
-
-  it('should retain relative labels for inactive filter choices', () => {
-    component.selectionModel.ownerFilter = OwnerFilterType.NONE
-
-    expect(component.ownerFilterLabel).toEqual('My documents')
-    expect(component.ownerExclusionFilterLabel).toEqual('Shared with me')
-    expect(component.sharedByFilterLabel).toEqual('Shared by me')
-  })
-
  it('should support reset', () => {
    component.setFilter(OwnerFilterType.OTHERS)
    expect(component.selectionModel.ownerFilter).not.toEqual(
@@ -93,55 +93,6 @@ export class PermissionsFilterDropdownComponent extends ComponentWithPermissions
    )
  }

-  get ownerFilterLabel(): string {
-    if (
-      this.selectionModel?.ownerFilter !== OwnerFilterType.SELF ||
-      this.selectionModel?.userID === this.settingsService.currentUser()?.id
-    ) {
-      return $localize`My documents`
-    }
-
-    const username = this.getUsername(this.selectionModel?.userID)
-    return username
-      ? $localize`Owned by ${username}`
-      : $localize`Owned by another user`
-  }
-
-  get ownerExclusionFilterLabel(): string {
-    const excludedUsers = this.selectionModel?.excludeUsers ?? []
-    if (
-      this.selectionModel?.ownerFilter !== OwnerFilterType.NOT_SELF ||
-      (excludedUsers.length === 1 &&
-        excludedUsers[0] === this.settingsService.currentUser()?.id)
-    ) {
-      return $localize`Shared with me`
-    }
-
-    const usernames = excludedUsers
-      .map((id) => this.getUsername(id))
-      .filter(Boolean)
-    if (usernames.length === excludedUsers.length && usernames.length > 0) {
-      return $localize`Not owned by ${usernames.join(', ')}`
-    }
-    return excludedUsers.length === 1
-      ? $localize`Not owned by another user`
-      : $localize`Not owned by selected users`
-  }
-
-  get sharedByFilterLabel(): string {
-    if (
-      this.selectionModel?.ownerFilter !== OwnerFilterType.SHARED_BY_ME ||
-      this.selectionModel?.userID === this.settingsService.currentUser()?.id
-    ) {
-      return $localize`Shared by me`
-    }
-
-    const username = this.getUsername(this.selectionModel?.userID)
-    return username
-      ? $localize`Shared by ${username}`
-      : $localize`Shared by another user`
-  }
-
  constructor() {
    const userService = inject(UserService)

@@ -213,8 +164,4 @@ export class PermissionsFilterDropdownComponent extends ComponentWithPermissions
    }
    this.onChange()
  }
-
-  private getUsername(userID: number): string {
-    return this.users().find((user) => user.id === userID)?.username
-  }
 }
@@ -17,10 +17,6 @@ const permissions = [
  'view_document',
  'change_document',
  'delete_document',
-  'add_sharelinkbundle',
-  'view_sharelinkbundle',
-  'change_sharelinkbundle',
-  'delete_sharelinkbundle',
  'change_tag',
  'view_documenttype',
 ]
@@ -79,7 +75,6 @@ describe('PermissionsSelectComponent', () => {
    component.ngOnInit()
    component.writeValue(permissions)
    expect(component.typesWithAllActions).toContain('Document')
-    expect(component.typesWithAllActions).toContain('ShareLinkBundle')
  })

  it('should update checkboxes on permissions set', () => {
@@ -90,10 +85,6 @@ describe('PermissionsSelectComponent', () => {
    expect(input1.nativeElement.checked).toBeTruthy()
    const input2 = fixture.debugElement.query(By.css('input#Tag_Change'))
    expect(input2.nativeElement.checked).toBeTruthy()
-    const bundleInput = fixture.debugElement.query(
-      By.css('input#ShareLinkBundle_Add')
-    )
-    expect(bundleInput.nativeElement.checked).toBeTruthy()
  })

  it('disable checkboxes when permissions are inherited', () => {
@@ -107,25 +98,6 @@ describe('PermissionsSelectComponent', () => {
    expect(component.form.get('Tag').get('Change').disabled).toBeTruthy()
  })

-  it('should update checkboxes when inherited permissions change', () => {
-    component.ngOnInit()
-    component.inheritedPermissions = ['documents.change_document']
-    component.writeValue(['delete_document'])
-    expect(component.form.get('Document').get('Change').value).toBeTruthy()
-    expect(component.form.get('Document').get('Change').disabled).toBeTruthy()
-
-    // swap for a group with a different permission, but the same number of them
-    component.inheritedPermissions = ['documents.view_document']
-
-    // the no-longer-inherited permission is unchecked, the explicit one is kept
-    expect(component.permissions).toEqual(['delete_document'])
-    expect(component.form.get('Document').get('Change').value).toBeFalsy()
-    expect(component.form.get('Document').get('Change').disabled).toBeFalsy()
-    expect(component.form.get('Document').get('Delete').value).toBeTruthy()
-    expect(component.form.get('Document').get('View').value).toBeTruthy()
-    expect(component.form.get('Document').get('View').disabled).toBeTruthy()
-  })
-
  it('should exclude history permissions if disabled', () => {
    settingsService.set(SETTINGS_KEYS.AUDITLOG_ENABLED, false)
    fixture = TestBed.createComponent(PermissionsSelectComponent)
@@ -74,22 +74,12 @@ export class PermissionsSelectComponent
      ? inherited.map((p) => p.replace(/^\w+\./g, ''))
      : []

-    const changed =
-      newInheritedPermissions.length !== this._inheritedPermissions.length ||
-      newInheritedPermissions.some(
-        (p) => !this._inheritedPermissions.includes(p)
-      )
-
-    if (changed) {
-      // skip inherited permissions, these are the explicitly set ones
-      this.permissions = this.getSelectedPermissions(
-        this.form.getRawValue()
-      ).filter((p) => !this._inheritedPermissions.includes(p))
+    if (this._inheritedPermissions !== newInheritedPermissions) {
      this._inheritedPermissions = newInheritedPermissions
-      this.applyCheckedState()
-    } else {
-      this.updateDisabledStates()
+      this.writeValue(this.permissions) // updates visual checks etc.
    }
+
+    this.updateDisabledStates()
  }

  inheritedWarning: string = $localize`Inherited from group`
@@ -116,29 +106,20 @@ export class PermissionsSelectComponent
    }

    this.permissions = permissions ?? []
-    this.applyCheckedState()
-  }
+    const allPerms = this._inheritedPermissions.concat(this.permissions)

-  // sets every checkbox from inherited + own perms
-  private applyCheckedState(): void {
-    const allPerms = new Set(
-      this._inheritedPermissions.concat(this.permissions)
-    )
+    allPerms.forEach((permissionStr) => {
+      const { actionKey, typeKey } =
+        this.permissionsService.getPermissionKeys(permissionStr)

-    this.allowedTypes.forEach((type) => {
-      const typeGroup = this.form.get(type)
-      for (const action of Object.keys(PermissionAction)) {
-        typeGroup.get(action)?.patchValue(
-          allPerms.has(
-            this.permissionsService.getPermissionCode(
-              PermissionAction[action],
-              PermissionType[type]
-            )
-          ),
-          { emitEvent: false } // don't trigger valueChanges now
-        )
+      if (actionKey && typeKey) {
+        this.form
+          .get(typeKey)
+          ?.get(actionKey)
+          ?.patchValue(true, { emitEvent: false })
      }
-
+    })
+    this.allowedTypes.forEach((type) => {
      if (this.typeHasAllActionsSelected(type)) {
        this.typesWithAllActions.add(type)
      } else {
@@ -169,9 +150,26 @@ export class PermissionsSelectComponent

  ngOnInit(): void {
    this.form.valueChanges.subscribe((newValue) => {
-      const permissions = this.getSelectedPermissions(newValue)
+      let permissions = []
+      Object.entries(newValue).forEach(([typeKey, typeValue]) => {
+        const selectedActions = Object.entries(typeValue).filter(
+          ([actionKey, actionValue]) =>
+            actionValue &&
+            this.isActionSupported(
+              PermissionType[typeKey],
+              PermissionAction[actionKey]
+            )
+        )
+
+        selectedActions.forEach(([actionKey]) => {
+          permissions.push(
+            (PermissionType[typeKey] as string).replace(
+              '%s',
+              PermissionAction[actionKey]
+            )
+          )
+        })

-      Object.keys(newValue).forEach((typeKey) => {
        if (this.typeHasAllActionsSelected(typeKey)) {
          this.typesWithAllActions.add(typeKey)
        } else {
@@ -271,30 +269,6 @@ export class PermissionsSelectComponent
    return true
  }

-  private getSelectedPermissions(formValue: object): string[] {
-    const permissions = []
-    Object.entries(formValue).forEach(([typeKey, typeValue]) => {
-      Object.entries(typeValue)
-        .filter(
-          ([actionKey, actionValue]) =>
-            actionValue &&
-            this.isActionSupported(
-              PermissionType[typeKey],
-              PermissionAction[actionKey]
-            )
-        )
-        .forEach(([actionKey]) => {
-          permissions.push(
-            this.permissionsService.getPermissionCode(
-              PermissionAction[actionKey],
-              PermissionType[typeKey]
-            )
-          )
-        })
-    })
-    return permissions
-  }
-
  private typeHasAllActionsSelected(typeKey: string): boolean {
    return Object.keys(PermissionAction)
      .filter((action) =>
@@ -119,7 +119,7 @@
        type="button"
        class="btn btn-primary btn-sm d-inline-flex align-items-center gap-2 text-nowrap"
        (click)="submit()"
-        [disabled]="loading() || !buttonsEnabled()">
+        [disabled]="loading() || !buttonsEnabled">
        @if (loading()) {
          <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
        }
@@ -69,7 +69,7 @@ describe('ShareLinkBundleDialogComponent', () => {
      file_version: FileVersion.Original,
      expiration_days: 3,
    })
-    expect(component.buttonsEnabled()).toBe(false)
+    expect(component.buttonsEnabled).toBe(false)
    expect(confirmSpy).toHaveBeenCalled()

    component.form.setValue({
@@ -78,7 +78,7 @@ export class ShareLinkBundleDialogComponent extends ConfirmDialogComponent {
        : FileVersion.Original,
      expiration_days: this.form.value.expirationDays,
    }
-    this.buttonsEnabled.set(false)
+    this.buttonsEnabled = false
    super.confirm()
  }

@@ -1,5 +1,5 @@
 <div class="btn-group">
-  <button type="button" class="btn btn-sm btn-outline-primary" (click)="clickSuggest()" [disabled]="disabled() || loading() || (suggestions() && !aiEnabled())" [aria-label]="noSuggestions ? 'No suggestions' : 'Suggest'" i18n-aria-label>
+  <button type="button" class="btn btn-sm btn-outline-primary" (click)="clickSuggest()" [disabled]="disabled() || loading() || (suggestions() && !aiEnabled())">
    @if (loading()) {
      <div class="spinner-border spinner-border-sm" role="status"></div>
    } @else if (noSuggestions) {
@@ -23,7 +23,7 @@
              <dd>
                {{status().pngx_version}}
                @if (versionMismatch()) {
-                    <button class="btn btn-sm d-inline align-items-center btn-dark text-uppercase small" [ngbPopover]="versionPopover" triggers="click mouseenter:mouseleave" aria-label="View version mismatch details" i18n-aria-label>
+                    <button class="btn btn-sm d-inline align-items-center btn-dark text-uppercase small" [ngbPopover]="versionPopover" triggers="click mouseenter:mouseleave">
                      <i-bs name="exclamation-triangle-fill" class="text-danger lh-1"></i-bs>
                    </button>
                }
@@ -1,7 +1,9 @@
-<pngx-page-header title="Dashboard" [subTitle]="subtitle" i18n-title tourAnchor="tour.dashboard"></pngx-page-header>
+<pngx-page-header title="Dashboard" [subTitle]="subtitle" i18n-title tourAnchor="tour.dashboard">
+  <pngx-logo extra_classes="d-none d-md-block mt-n2" height="3rem"></pngx-logo>
+</pngx-page-header>

-<div class="row dashboard-grid g-4 pb-0">
-  <div class="col-12 col-lg-8 col-xl-9 mb-4 dashboard-main">
+<div class="row">
+  <div class="col-12 col-lg-8 col-xl-9 mb-4">
    <div class="row row-cols-1 g-4"
      cdkDropList
      [cdkDropListDisabled]="settingsService.globalDropzoneActive()"
@@ -56,7 +58,7 @@
      </ng-container>
    </div>
  </div>
-  <div class="col-12 col-lg-4 col-xl-3 col-sidebar dashboard-aside">
+  <div class="col-12 col-lg-4 col-xl-3 col-sidebar">
    <div class="row row-cols-1 g-4 mb-4 sticky-lg-top z-0">
      <pngx-upload-file-widget></pngx-upload-file-widget>
      <pngx-statistics-widget *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.UISettings }"></pngx-statistics-widget>
@@ -1,13 +1,3 @@
 .col-sidebar .row {
-  top: 4.75rem;
-}
-
-.dashboard-grid {
-  padding-bottom: 2rem;
-}
-
-@media (min-width: 1200px) {
-  .dashboard-main {
-    padding-right: 1rem;
-  }
+    top: 3.5rem;
 }
@@ -15,6 +15,7 @@ import { SavedViewService } from 'src/app/services/rest/saved-view.service'
 import { SettingsService } from 'src/app/services/settings.service'
 import { ToastService } from 'src/app/services/toast.service'
 import { environment } from 'src/environments/environment'
+import { LogoComponent } from '../common/logo/logo.component'
 import { PageHeaderComponent } from '../common/page-header/page-header.component'
 import { ComponentWithPermissions } from '../with-permissions/with-permissions.component'
 import { SavedViewWidgetComponent } from './widgets/saved-view-widget/saved-view-widget.component'
@@ -27,6 +28,7 @@ import { WelcomeWidgetComponent } from './widgets/welcome-widget/welcome-widget.
  templateUrl: './dashboard.component.html',
  styleUrls: ['./dashboard.component.scss'],
  imports: [
+    LogoComponent,
    PageHeaderComponent,
    SavedViewWidgetComponent,
    StatisticsWidgetComponent,
@@ -8,14 +8,3 @@
        width: 0.6rem;
    }
 }
-
-.list-group {
-  --bs-list-group-border-color: color-mix(in srgb, var(--bs-border-color) 58%, transparent);
-  --bs-list-group-bg: transparent;
-  border-radius: .6rem;
-  overflow: hidden;
-}
-
-.list-group-item {
-  padding: .7rem .8rem;
-}
@@ -4,16 +4,6 @@

 .btn-outline-dark {
  --bs-btn-border-color: var(--bs-border-color-translucent);
-  border-style: dashed;
-  border-width: 1px;
-  min-height: 5.25rem;
-  background: color-mix(in srgb, var(--bs-primary) 4%, var(--bs-light)) !important;
-
-  &:hover,
-  &:focus {
-    border-color: var(--bs-primary);
-    background: color-mix(in srgb, var(--bs-primary) 9%, var(--bs-light)) !important;
-  }
 }

 .smaller {
@@ -1,5 +1,5 @@
@if (!cardless()) {
-  <div class="card bg-light fade" [class.show]="show()" cdkDrag [cdkDragDisabled]="!draggable()" cdkDragPreviewContainer="parent">
+  <div class="card shadow-sm bg-light fade" [class.show]="show()" cdkDrag [cdkDragDisabled]="!draggable()" cdkDragPreviewContainer="parent">
    <div class="card-header">
      <div class="d-flex justify-content-between align-items-center">
        <div class="d-flex align-items-center">
@@ -2,20 +2,6 @@ i-bs {
    cursor: move;
 }

-.card {
-  overflow: hidden;
-  border-color: color-mix(in srgb, var(--bs-border-color) 68%, transparent);
-
-  .card-header {
-    padding: .9rem 1rem;
-    border-bottom-color: color-mix(in srgb, var(--bs-border-color) 55%, transparent);
-  }
-
-  .card-body {
-    padding: 1rem;
-  }
-}
-
 .fade.show {
  animation: pngx-entry-fade 160ms ease-out;
 }
@@ -20,7 +20,7 @@
    </div>
  }

-  <button type="button" class="btn btn-sm btn-outline-danger me-md-4" (click)="delete()" [disabled]="!userIsOwner" *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.Document }" aria-label="Delete" i18n-aria-label>
+  <button type="button" class="btn btn-sm btn-outline-danger me-md-4" (click)="delete()" [disabled]="!userIsOwner" *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.Document }">
    <i-bs width="1.2em" height="1.2em" name="trash"></i-bs><span class="d-none d-lg-inline ps-1" i18n>Delete</span>
  </button>

@@ -35,7 +35,7 @@
  />

  <div class="btn-group">
-    <button (click)="download()" class="btn btn-sm btn-outline-primary" [disabled]="downloading()" aria-label="Download" i18n-aria-label>
+    <button (click)="download()" class="btn btn-sm btn-outline-primary" [disabled]="downloading()">
      @if (downloading()) {
        <div class="spinner-border spinner-border-sm" role="status"></div>
      } @else {
@@ -45,7 +45,7 @@
    </button>

    <div class="btn-group" ngbDropdown role="group">
-      <button class="btn btn-sm btn-outline-primary dropdown-toggle" [disabled]="downloading()" ngbDropdownToggle aria-label="Download options" i18n-aria-label></button>
+      <button class="btn btn-sm btn-outline-primary dropdown-toggle" [disabled]="downloading()" ngbDropdownToggle></button>
      <div class="dropdown-menu shadow" ngbDropdownMenu>
        @if (metadata()?.has_archive_version) {
          <button ngbDropdownItem (click)="download(true)" [disabled]="downloading()" i18n>Download original</button>
@@ -62,7 +62,7 @@
  </div>

  <div class="ms-auto" ngbDropdown>
-    <button class="btn btn-sm btn-outline-primary" id="actionsDropdown" ngbDropdownToggle aria-label="Actions" i18n-aria-label>
+    <button class="btn btn-sm btn-outline-primary" id="actionsDropdown" ngbDropdownToggle>
      <i-bs name="three-dots"></i-bs><div class="d-none d-sm-inline ms-1"><ng-container i18n>Actions</ng-container></div>
    </button>
    <div ngbDropdownMenu aria-labelledby="actionsDropdown" class="shadow">
@@ -91,7 +91,7 @@
  </div>

  <div class="ms-auto" ngbDropdown>
-    <button class="btn btn-sm btn-outline-primary" id="sendDropdown" ngbDropdownToggle aria-label="Send" i18n-aria-label>
+    <button class="btn btn-sm btn-outline-primary" id="sendDropdown" ngbDropdownToggle>
      <i-bs name="send"></i-bs><div class="d-none d-sm-inline ms-1"><ng-container i18n>Send</ng-container></div>
    </button>
    <div ngbDropdownMenu aria-labelledby="actionsDropdown" class="shadow">
@@ -467,13 +467,6 @@ describe('DocumentDetailComponent', () => {
    const docWithVersions = {
      ...doc,
      versions: [
-        {
-          id: 10,
-          added: new Date('2024-01-02T00:00:00Z'),
-          version_label: 'Edited',
-          checksum: 'bbbb',
-          is_root: false,
-        },
        {
          id: doc.id,
          added: new Date('2024-01-01T00:00:00Z'),
@@ -481,6 +474,13 @@ describe('DocumentDetailComponent', () => {
          checksum: 'aaaa',
          is_root: true,
        },
+        {
+          id: 10,
+          added: new Date('2024-01-02T00:00:00Z'),
+          version_label: 'Edited',
+          checksum: 'bbbb',
+          is_root: false,
+        },
      ],
    } as Document

@@ -963,24 +963,12 @@ describe('DocumentDetailComponent', () => {
    component.reprocess()
    const modalCloseSpy = jest.spyOn(openModal, 'close')
    openModal.componentInstance.confirmClicked.next()
-    expect(reprocessSpy).toHaveBeenCalledWith({ documents: [doc.id] }, false)
+    expect(reprocessSpy).toHaveBeenCalledWith({ documents: [doc.id] })
    expect(modalSpy).toHaveBeenCalled()
    expect(toastSpy).toHaveBeenCalled()
    expect(modalCloseSpy).toHaveBeenCalled()
  })

-  it('should pass remote OCR choice when reprocessing', () => {
-    initNormally()
-    const reprocessSpy = jest.spyOn(documentService, 'reprocessDocuments')
-    reprocessSpy.mockReturnValue(of(true))
-    let openModal: NgbModalRef
-    modalService.activeInstances.subscribe((modal) => (openModal = modal[0]))
-    component.reprocess()
-    openModal.componentInstance.remoteOcr = true
-    openModal.componentInstance.confirmClicked.next()
-    expect(reprocessSpy).toHaveBeenCalledWith({ documents: [doc.id] }, true)
-  })
-
  it('should show error if redo ocr call fails', () => {
    initNormally()
    const reprocessSpy = jest.spyOn(documentService, 'reprocessDocuments')
@@ -1244,8 +1232,8 @@ describe('DocumentDetailComponent', () => {

    metadataSpy.mockClear()
    component.document().versions = [
-      { id: 10, is_root: false },
      { id: doc.id, is_root: true },
+      { id: 10, is_root: false },
    ] as any
    jest.spyOn(documentService, 'getPreviewUrl').mockReturnValue('preview-root')
    jest.spyOn(documentService, 'getThumbUrl').mockReturnValue('thumb-root')
@@ -1576,7 +1564,7 @@ describe('DocumentDetailComponent', () => {
    dialog.confirmClicked.next()
    await openModal.result

-    expect(dialog.buttonsEnabled()).toBe(false)
+    expect(dialog.buttonsEnabled).toBe(false)
    expect(reloadSpy).toHaveBeenCalled()
    expect((component as any).incomingUpdateModal).toBeNull()
  })
@@ -1801,7 +1789,7 @@ describe('DocumentDetailComponent', () => {

    expect(errorSpy).toHaveBeenCalled()
    expect(component.networkActive()).toBe(false)
-    expect(dialog.buttonsEnabled()).toBe(true)
+    expect(dialog.buttonsEnabled).toBe(true)
  })

  it('should refresh the document when removing password in update mode', () => {
@@ -1941,8 +1929,8 @@ describe('DocumentDetailComponent', () => {
    component.documentId.set(doc.id)
    component.document.set({ ...doc, versions: [] } as Document)
    const updatedVersions = [
-      { id: 10, is_root: false },
      { id: doc.id, is_root: true },
+      { id: 10, is_root: false },
    ] as any
    const openDoc = { ...doc, versions: [] } as Document
    jest.spyOn(openDocumentsService, 'getOpenDocument').mockReturnValue(openDoc)
@@ -2058,8 +2046,8 @@ describe('DocumentDetailComponent', () => {
  it('should include version in download and print only for non-latest selected version', () => {
    initNormally()
    component.document().versions = [
-      { id: 10, is_root: false },
      { id: doc.id, is_root: true },
+      { id: 10, is_root: false },
    ] as any

    const getDownloadUrlSpy = jest
@@ -2183,11 +2171,6 @@ describe('DocumentDetailComponent', () => {
    ).toBe(10)
    component.openEmailDocument()
    expect(modalSpy).toHaveBeenCalled()
-    expect(
-      (
-        modalSpy.mock.results[1].value as NgbModalRef
-      ).componentInstance.documentIds()
-    ).toEqual([10])
  })

  it('should set previewText', () => {
@@ -97,7 +97,6 @@ import { ISODateAdapter } from 'src/app/utils/ngb-iso-date-adapter'
 import * as UTIF from 'utif'
 import { DocumentDetailFieldID } from '../admin/settings/settings.component'
 import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component'
-import { ReprocessConfirmDialogComponent } from '../common/confirm-dialog/reprocess-confirm-dialog/reprocess-confirm-dialog.component'
 import { PasswordRemovalConfirmDialogComponent } from '../common/confirm-dialog/password-removal-confirm-dialog/password-removal-confirm-dialog.component'
 import { CustomFieldsDropdownComponent } from '../common/custom-fields-dropdown/custom-fields-dropdown.component'
 import { CorrespondentEditDialogComponent } from '../common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component'
@@ -660,7 +659,7 @@ export class DocumentDetailComponent
    modal.componentInstance.cancelBtnCaption = $localize`Dismiss`

    modal.componentInstance.confirmClicked.pipe(first()).subscribe(() => {
-      modal.componentInstance.buttonsEnabled.set(false)
+      modal.componentInstance.buttonsEnabled = false
      modal.close()
      this.reloadRemoteVersion()
    })
@@ -890,9 +889,13 @@ export class DocumentDetailComponent

  updateComponent(doc: Document) {
    this.document.set(doc)
-    // Default selected version is the newest version, which the API returns first
+    // Default selected version is the newest version
    const versions = doc.versions ?? []
-    this.selectedVersionId.set(versions.length ? versions[0].id : doc.id)
+    this.selectedVersionId.set(
+      versions.length
+        ? Math.max(...versions.map((version) => version.id))
+        : doc.id
+    )
    this.previewLoaded.set(false)
    this.requiresPassword = false
    this.updateFormForCustomFields()
@@ -1371,7 +1374,7 @@ export class DocumentDetailComponent
    modal.componentInstance.confirmClicked
      .pipe(
        switchMap(() => {
-          modal.componentInstance.buttonsEnabled.set(false)
+          modal.componentInstance.buttonsEnabled = false
          return this.documentsService.delete(this.document())
        })
      )
@@ -1383,7 +1386,7 @@ export class DocumentDetailComponent
        },
        error: (error) => {
          this.toastService.showError($localize`Error deleting document`, error)
-          modal.componentInstance.buttonsEnabled.set(true)
+          modal.componentInstance.buttonsEnabled = true
          this.subscribeModalDelete(modal)
        },
      })
@@ -1399,7 +1402,7 @@ export class DocumentDetailComponent
  }

  reprocess() {
-    let modal = this.modalService.open(ReprocessConfirmDialogComponent, {
+    let modal = this.modalService.open(ConfirmDialogComponent, {
      backdrop: 'static',
    })
    modal.componentInstance.title = $localize`Reprocess confirm`
@@ -1408,12 +1411,9 @@ export class DocumentDetailComponent
    modal.componentInstance.btnClass = 'btn-danger'
    modal.componentInstance.btnCaption = $localize`Proceed`
    modal.componentInstance.confirmClicked.subscribe(() => {
-      modal.componentInstance.buttonsEnabled.set(false)
+      modal.componentInstance.buttonsEnabled = false
      this.documentsService
-        .reprocessDocuments(
-          { documents: [this.document().id] },
-          modal.componentInstance.remoteOcr
-        )
+        .reprocessDocuments({ documents: [this.document().id] })
        .subscribe({
          next: () => {
            this.toastService.showInfo(
@@ -1425,7 +1425,7 @@ export class DocumentDetailComponent
          },
          error: (error) => {
            if (modal) {
-              modal.componentInstance.buttonsEnabled.set(true)
+              modal.componentInstance.buttonsEnabled = true
            }
            this.toastService.showError(
              $localize`Error executing operation`,
@@ -1441,8 +1441,7 @@ export class DocumentDetailComponent
    if (!versions.length || !this.selectedVersionId()) {
      return null
    }
-    // The API returns versions newest first
-    const latestVersionId = versions[0].id
+    const latestVersionId = Math.max(...versions.map((version) => version.id))
    return this.selectedVersionId() === latestVersionId
      ? null
      : this.selectedVersionId()
@@ -1799,7 +1798,7 @@ export class DocumentDetailComponent
    modal.componentInstance.confirmClicked
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(() => {
-        modal.componentInstance.buttonsEnabled.set(false)
+        modal.componentInstance.buttonsEnabled = false
        this.documentsService
          .editPdfDocuments([sourceDocumentId], {
            operations: modal.componentInstance.getOperations(),
@@ -1822,7 +1821,7 @@ export class DocumentDetailComponent
            },
            error: (error) => {
              if (modal) {
-                modal.componentInstance.buttonsEnabled.set(true)
+                modal.componentInstance.buttonsEnabled = true
              }
              this.toastService.showError(
                $localize`Error executing PDF edit operation`,
@@ -1856,7 +1855,7 @@ export class DocumentDetailComponent
        const sourceDocumentId = this.selectedVersionId() ?? this.document().id
        const dialog =
          modal.componentInstance as PasswordRemovalConfirmDialogComponent
-        dialog.buttonsEnabled.set(false)
+        dialog.buttonsEnabled = false
        this.networkActive.set(true)
        this.documentsService
          .removePasswordDocuments([sourceDocumentId], {
@@ -1881,7 +1880,7 @@ export class DocumentDetailComponent
              }
            },
            error: (error) => {
-              dialog.buttonsEnabled.set(true)
+              dialog.buttonsEnabled = true
              this.networkActive.set(false)
              this.toastService.showError(
                $localize`Error executing password removal operation`,
@@ -1977,9 +1976,7 @@ export class DocumentDetailComponent
    const modal = this.modalService.open(EmailDocumentDialogComponent, {
      backdrop: 'static',
    })
-    modal.componentInstance.documentIds.set([
-      this.selectedVersionId() ?? this.document().id,
-    ])
+    modal.componentInstance.documentIds.set([this.document().id])
    modal.componentInstance.hasArchiveVersion.set(
      this.metadata()?.has_archive_version ??
        !!this.document()?.archived_file_name
@@ -1,18 +0,0 @@
-<div class="modal-header">
-  <h4 class="modal-title" i18n>Add existing document as version</h4>
-  <button type="button" class="btn-close" aria-label="Close" (click)="cancel()"></button>
-</div>
-<div class="modal-body">
-  <pngx-input-document-link
-    [(ngModel)]="selectedDocumentIDs"
-    [parentDocumentID]="rootDocumentID"
-    [minimal]="true"
-    placeholder="Search for a document"
-    i18n-placeholder
-  ></pngx-input-document-link>
-  <div class="form-text mt-2" i18n>Select one document to add as a version.</div>
-</div>
-<div class="modal-footer">
-  <button type="button" class="btn btn-outline-secondary" (click)="cancel()" [disabled]="!buttonsEnabled()" i18n>Cancel</button>
-  <button type="button" class="btn btn-primary" (click)="confirm()" [disabled]="!buttonsEnabled() || selectedDocumentIDs.length !== 1" i18n>Add version</button>
-</div>
@@ -1,73 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing'
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
-import { DocumentService } from 'src/app/services/rest/document.service'
-import { AddExistingDocumentVersionDialogComponent } from './add-existing-document-version-dialog.component'
-
-describe('AddExistingDocumentVersionDialogComponent', () => {
-  let component: AddExistingDocumentVersionDialogComponent
-  let fixture: ComponentFixture<AddExistingDocumentVersionDialogComponent>
-  let activeModal: jest.Mocked<Pick<NgbActiveModal, 'dismiss'>>
-
-  beforeEach(async () => {
-    activeModal = { dismiss: jest.fn() }
-    await TestBed.configureTestingModule({
-      imports: [AddExistingDocumentVersionDialogComponent],
-      providers: [
-        {
-          provide: NgbActiveModal,
-          useValue: activeModal,
-        },
-        {
-          provide: DocumentService,
-          useValue: {},
-        },
-      ],
-    }).compileComponents()
-
-    fixture = TestBed.createComponent(AddExistingDocumentVersionDialogComponent)
-    component = fixture.componentInstance
-    component.rootDocumentID = 3
-    fixture.detectChanges()
-  })
-
-  it('should emit the single selected document', () => {
-    const emitSpy = jest.spyOn(component.confirmClicked, 'emit')
-    component.selectedDocumentIDs = [20]
-
-    component.confirm()
-
-    expect(emitSpy).toHaveBeenCalledWith(20)
-  })
-
-  it('should require exactly one selected document', () => {
-    const emitSpy = jest.spyOn(component.confirmClicked, 'emit')
-    component.selectedDocumentIDs = [20, 21]
-
-    component.confirm()
-
-    expect(emitSpy).not.toHaveBeenCalled()
-  })
-
-  it('should dismiss on cancel', () => {
-    component.cancel()
-
-    expect(activeModal.dismiss).toHaveBeenCalled()
-  })
-
-  it('should re-render the buttons when they are toggled from outside', async () => {
-    const cancelButton: HTMLButtonElement = fixture.nativeElement.querySelector(
-      '.modal-footer button'
-    )
-    expect(cancelButton.disabled).toBeFalsy()
-
-    // No detectChanges: the dropdown toggling this from a request callback is
-    // all that happens, and nothing else schedules a render for the modal
-    component.buttonsEnabled.set(false)
-    await fixture.whenStable()
-    expect(cancelButton.disabled).toBeTruthy()
-
-    component.buttonsEnabled.set(true)
-    await fixture.whenStable()
-    expect(cancelButton.disabled).toBeFalsy()
-  })
-})
@@ -1,35 +0,0 @@
-import {
-  Component,
-  EventEmitter,
-  Input,
-  Output,
-  inject,
-  signal,
-} from '@angular/core'
-import { FormsModule } from '@angular/forms'
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
-import { DocumentLinkComponent } from 'src/app/components/common/input/document-link/document-link.component'
-
-@Component({
-  selector: 'pngx-add-existing-document-version-dialog',
-  templateUrl: './add-existing-document-version-dialog.component.html',
-  imports: [DocumentLinkComponent, FormsModule],
-})
-export class AddExistingDocumentVersionDialogComponent {
-  private readonly activeModal = inject(NgbActiveModal)
-
-  @Input() rootDocumentID: number
-  @Output() confirmClicked = new EventEmitter<number>()
-
-  selectedDocumentIDs: number[] = []
-  readonly buttonsEnabled = signal(true)
-
-  confirm(): void {
-    if (this.selectedDocumentIDs.length !== 1) return
-    this.confirmClicked.emit(this.selectedDocumentIDs[0])
-  }
-
-  cancel(): void {
-    this.activeModal.dismiss()
-  }
-}
@@ -1,10 +1,7 @@
 <div class="btn-group" ngbDropdown autoClose="outside">
-  <button class="btn btn-sm btn-outline-secondary dropdown-toggle" ngbDropdownToggle aria-label="Versions" i18n-aria-label>
+  <button class="btn btn-sm btn-outline-secondary dropdown-toggle" ngbDropdownToggle>
    <i-bs name="file-earmark-diff"></i-bs>
    <span class="d-none d-lg-inline ps-1" i18n>Versions</span>
-    @if (versions.length > 1) {
-      <span class="badge text-bg-secondary ms-1">{{ versions.length }}</span>
-    }
  </button>
  <div class="dropdown-menu shadow" ngbDropdownMenu>
    <div class="px-3 py-2 mb-2">
@@ -27,26 +24,13 @@
          class="visually-hidden"
          (change)="onVersionFileSelected($event)"
        />
-        <div class="btn-group btn-group-sm w-100">
-          <button
-            class="btn btn-sm btn-outline-secondary w-100"
-            (click)="versionFileInput.click()"
-            [disabled]="!userIsOwner || !userCanEdit"
-            title="Upload a new version"
-            i18n-title
-          >
-            <i-bs name="file-earmark-plus"></i-bs><span class="ps-1" i18n>Upload</span>
-          </button>
-          <button
-            class="btn btn-sm btn-outline-secondary w-100"
-            (click)="addExistingDocumentAsVersion()"
-            [disabled]="!userIsOwner || !userCanEdit"
-            title="Use an existing document"
-            i18n-title
-          >
-            <i-bs name="file-earmark"></i-bs><span class="ps-1" i18n>Existing</span>
-          </button>
-        </div>
+        <button
+          class="btn btn-sm btn-outline-secondary w-100"
+          (click)="versionFileInput.click()"
+          [disabled]="!userIsOwner || !userCanEdit"
+        >
+          <i-bs name="file-earmark-plus"></i-bs><span class="ps-1" i18n>Add new version</span>
+        </button>
      } @else {
        @switch (versionUploadState()) {
          @case (UploadState.Uploading) {
@@ -144,7 +128,6 @@
              i18n-confirmMessage
              [disabled]="!userIsOwner || !userCanEdit"
              (confirm)="deleteVersion(version.id)"
-              *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.Document }"
            >
              <span class="visually-hidden" i18n>Delete version</span>
            </pngx-confirm-button>
@@ -1,16 +1,9 @@
 import { DatePipe } from '@angular/common'
-import { SimpleChange, signal } from '@angular/core'
+import { SimpleChange } from '@angular/core'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
-import { By } from '@angular/platform-browser'
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { Subject, of, throwError } from 'rxjs'
 import { DocumentVersionInfo } from 'src/app/data/document'
-import {
-  PermissionAction,
-  PermissionsService,
-  PermissionType,
-} from 'src/app/services/permissions.service'
 import { DocumentService } from 'src/app/services/rest/document.service'
 import { SettingsService } from 'src/app/services/settings.service'
 import { ToastService } from 'src/app/services/toast.service'
@@ -26,20 +19,12 @@ describe('DocumentVersionDropdownComponent', () => {
  let documentService: jest.Mocked<
    Pick<
      DocumentService,
-      | 'deleteVersion'
-      | 'getVersions'
-      | 'mergeDocumentsAsVersions'
-      | 'uploadVersion'
-      | 'updateVersionLabel'
+      'deleteVersion' | 'getVersions' | 'uploadVersion' | 'updateVersionLabel'
    >
  >
  let toastService: jest.Mocked<Pick<ToastService, 'showError' | 'showInfo'>>
  let finished$: Subject<{ taskId: string }>
  let failed$: Subject<{ taskId: string; message?: string }>
-  let modalService: jest.Mocked<Pick<NgbModal, 'open'>>
-  let permissionsService: jest.Mocked<
-    Pick<PermissionsService, 'currentUserCan'>
-  >

  beforeEach(async () => {
    finished$ = new Subject<{ taskId: string }>()
@@ -47,18 +32,13 @@ describe('DocumentVersionDropdownComponent', () => {
    documentService = {
      deleteVersion: jest.fn(),
      getVersions: jest.fn(),
-      mergeDocumentsAsVersions: jest.fn(),
      uploadVersion: jest.fn(),
      updateVersionLabel: jest.fn(),
    }
-    modalService = { open: jest.fn() }
    toastService = {
      showError: jest.fn(),
      showInfo: jest.fn(),
    }
-    permissionsService = {
-      currentUserCan: jest.fn().mockReturnValue(true),
-    }

    await TestBed.configureTestingModule({
      imports: [
@@ -81,14 +61,6 @@ describe('DocumentVersionDropdownComponent', () => {
          provide: ToastService,
          useValue: toastService,
        },
-        {
-          provide: NgbModal,
-          useValue: modalService,
-        },
-        {
-          provide: PermissionsService,
-          useValue: permissionsService,
-        },
        {
          provide: WebsocketStatusService,
          useValue: {
@@ -159,31 +131,6 @@ describe('DocumentVersionDropdownComponent', () => {
    )
  })

-  it('should not show version delete buttons without document delete permission', () => {
-    fixture.destroy()
-    permissionsService.currentUserCan.mockReturnValue(false)
-    fixture = TestBed.createComponent(DocumentVersionDropdownComponent)
-    component = fixture.componentInstance
-    component.documentId = 3
-    component.selectedVersionId = 3
-    component.userIsOwner = true
-    component.userCanEdit = true
-    component.versions = [
-      { id: 3, is_root: true, checksum: 'aaaa' },
-      { id: 10, is_root: false, checksum: 'bbbb' },
-    ]
-
-    fixture.detectChanges()
-
-    expect(permissionsService.currentUserCan).toHaveBeenCalledWith(
-      PermissionAction.Delete,
-      PermissionType.Document
-    )
-    expect(
-      fixture.debugElement.queryAll(By.css('pngx-confirm-button'))
-    ).toHaveLength(0)
-  })
-
  it('beginEditingVersion should set active row and draft label', () => {
    component.userCanEdit = true
    component.userIsOwner = true
@@ -275,10 +222,9 @@ describe('DocumentVersionDropdownComponent', () => {
  })

  it('onVersionFileSelected should upload and update versions after websocket success', () => {
-    // Newest first, as the API returns them
    const versions: DocumentVersionInfo[] = [
-      { id: 20, is_root: false, checksum: 'cccc' },
      { id: 3, is_root: true, checksum: 'aaaa' },
+      { id: 20, is_root: false, checksum: 'cccc' },
    ]
    const file = new File(['test'], 'new-version.pdf', {
      type: 'application/pdf',
@@ -377,45 +323,4 @@ describe('DocumentVersionDropdownComponent', () => {
    expect(component.editingVersionId).toBeNull()
    expect(component.versionLabelDraft).toEqual('')
  })
-
-  it('addExistingDocumentAsVersion should merge with a label and refresh versions', () => {
-    const confirmClicked = new Subject<number>()
-    const modal = {
-      componentInstance: {
-        rootDocumentID: null,
-        buttonsEnabled: signal(true),
-        confirmClicked,
-      },
-      close: jest.fn(),
-    }
-    modalService.open.mockReturnValue(modal as any)
-    documentService.mergeDocumentsAsVersions.mockReturnValue(of({} as any))
-    // Newest first, as the API returns them. The merged document has a lower id
-    // than the root, which is the whole point of merging an existing document.
-    const versions: DocumentVersionInfo[] = [
-      { id: 2, is_root: false, checksum: 'cccc' },
-      { id: 3, is_root: true, checksum: 'aaaa' },
-    ]
-    documentService.getVersions.mockReturnValue(of({ id: 3, versions } as any))
-    component.newVersionLabel = '  Imported  '
-    const versionsEmitSpy = jest.spyOn(component.versionsUpdated, 'emit')
-    const selectedEmitSpy = jest.spyOn(component.versionSelected, 'emit')
-
-    component.addExistingDocumentAsVersion()
-    expect(modal.componentInstance.rootDocumentID).toEqual(3)
-    confirmClicked.next(2)
-
-    expect(documentService.mergeDocumentsAsVersions).toHaveBeenCalledWith(
-      [3, 2],
-      3,
-      'Imported'
-    )
-    expect(documentService.updateVersionLabel).not.toHaveBeenCalled()
-    expect(documentService.getVersions).toHaveBeenCalledWith(3)
-    expect(versionsEmitSpy).toHaveBeenCalledWith(versions)
-    expect(selectedEmitSpy).toHaveBeenCalledWith(2)
-    expect(component.newVersionLabel).toEqual('')
-    expect(modal.close).toHaveBeenCalled()
-    expect(toastService.showInfo).toHaveBeenCalled()
-  })
 })
@@ -11,7 +11,7 @@ import {
  SimpleChanges,
 } from '@angular/core'
 import { FormsModule } from '@angular/forms'
-import { NgbDropdownModule, NgbModal } from '@ng-bootstrap/ng-bootstrap'
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { merge, of, Subject } from 'rxjs'
 import {
@@ -25,7 +25,6 @@ import {
  tap,
 } from 'rxjs/operators'
 import { DocumentVersionInfo } from 'src/app/data/document'
-import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
 import { DocumentService } from 'src/app/services/rest/document.service'
 import { ToastService } from 'src/app/services/toast.service'
@@ -34,8 +33,6 @@ import {
  WebsocketStatusService,
 } from 'src/app/services/websocket-status.service'
 import { ConfirmButtonComponent } from '../../common/confirm-button/confirm-button.component'
-import { ComponentWithPermissions } from '../../with-permissions/with-permissions.component'
-import { AddExistingDocumentVersionDialogComponent } from './add-existing-document-version-dialog/add-existing-document-version-dialog.component'

@Component({
  selector: 'pngx-document-version-dropdown',
@@ -46,15 +43,11 @@ import { AddExistingDocumentVersionDialogComponent } from './add-existing-docume
    NgbDropdownModule,
    NgxBootstrapIconsModule,
    ConfirmButtonComponent,
-    IfPermissionsDirective,
    SlicePipe,
    CustomDatePipe,
  ],
 })
-export class DocumentVersionDropdownComponent
-  extends ComponentWithPermissions
-  implements OnChanges, OnDestroy
-{
+export class DocumentVersionDropdownComponent implements OnChanges, OnDestroy {
  UploadState = UploadState

  @Input() documentId: number
@@ -76,7 +69,6 @@ export class DocumentVersionDropdownComponent
  private readonly documentsService = inject(DocumentService)
  private readonly toastService = inject(ToastService)
  private readonly websocketStatusService = inject(WebsocketStatusService)
-  private readonly modalService = inject(NgbModal)
  private readonly destroy$ = new Subject<void>()
  private readonly documentChange$ = new Subject<void>()

@@ -264,10 +256,11 @@ export class DocumentVersionDropdownComponent
      .subscribe({
        next: (doc) => {
          if (uploadDocumentId !== this.documentId) return
-          if (doc?.versions?.length) {
+          if (doc?.versions) {
            this.versionsUpdated.emit(doc.versions)
-            // The API returns versions newest first
-            this.versionSelected.emit(doc.versions[0].id)
+            this.versionSelected.emit(
+              Math.max(...doc.versions.map((version) => version.id))
+            )
            this.clearVersionUploadStatus()
          }
        },
@@ -285,55 +278,6 @@ export class DocumentVersionDropdownComponent
      })
  }

-  addExistingDocumentAsVersion(): void {
-    const modal = this.modalService.open(
-      AddExistingDocumentVersionDialogComponent,
-      { backdrop: 'static' }
-    )
-    const dialog =
-      modal.componentInstance as AddExistingDocumentVersionDialogComponent
-    dialog.rootDocumentID = this.documentId
-    dialog.confirmClicked
-      .pipe(takeUntil(this.destroy$), takeUntil(this.documentChange$))
-      .subscribe((existingDocumentID) => {
-        dialog.buttonsEnabled.set(false)
-        const versionLabel = this.newVersionLabel?.trim()
-        this.documentsService
-          .mergeDocumentsAsVersions(
-            [this.documentId, existingDocumentID],
-            this.documentId,
-            versionLabel
-          )
-          .pipe(
-            switchMap(() => this.documentsService.getVersions(this.documentId)),
-            first(),
-            finalize(() => dialog.buttonsEnabled.set(true)),
-            takeUntil(this.destroy$),
-            takeUntil(this.documentChange$)
-          )
-          .subscribe({
-            next: (document) => {
-              if (document?.versions?.length) {
-                this.versionsUpdated.emit(document.versions)
-                // The API returns versions newest first
-                this.versionSelected.emit(document.versions[0].id)
-              }
-              this.newVersionLabel = ''
-              modal.close()
-              this.toastService.showInfo(
-                $localize`Existing document added as a version.`
-              )
-            },
-            error: (error) => {
-              this.toastService.showError(
-                $localize`Error adding existing document as a version`,
-                error
-              )
-            },
-          })
-      })
-  }
-
  clearVersionUploadStatus(): void {
    this.versionUploadState.set(UploadState.Idle)
    this.versionUploadError.set(null)
--- a/Show More
+++ b/Show More