Feature: propagate resolved secrets to interactive container shells

2026-08-18 00:33:18 +00:00 · 2026-08-09 15:57:47 -07:00
115 changed files with 1879 additions and 6936 deletions
@@ -173,6 +173,10 @@ RUN set -eux \
        && rm --force --verbose *.deb \
    && rm --recursive --force --verbose /var/lib/apt/lists/*

+# Ensure interactive shells (docker exec bash) see resolved *_FILE secrets,
+# mirroring what with-contenv already does for s6 services.
+RUN echo '. /etc/profile.d/contenv.sh' >> /etc/bash.bashrc
+
 WORKDIR /usr/src/paperless/src/

 # Python dependencies
@@ -0,0 +1,18 @@
+#!/bin/sh
+# Source s6 container environment for interactive shells.
+# Ensures variables resolved from *_FILE secret injection are visible
+# when using 'docker exec bash'. Does not affect s6 services (those
+# use with-contenv directly). Has no effect in non-container contexts
+# because the directory will not exist.
+# Note: sh/dash shells opened via 'docker exec sh' are not covered;
+# only bash-based sessions benefit from this file.
+_pngx_contenv="/run/s6/container_environment"
+if [ -d "${_pngx_contenv}" ]; then
+	for _pngx_f in "${_pngx_contenv}"/*; do
+		[ -f "${_pngx_f}" ] || continue
+		_pngx_name=$(basename "${_pngx_f}")
+		_pngx_val=$(cat "${_pngx_f}")
+		export "${_pngx_name}=${_pngx_val}"
+	done
+fi
+unset _pngx_contenv _pngx_f _pngx_name _pngx_val
@@ -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.

@@ -714,7 +699,6 @@ document_fuzzy_match [--ratio] [--processes N]
 | --ratio     | No       | 85.0                | a number between 0 and 100, setting how similar a document must be for it to be reported. Higher numbers mean more similarity. |
 | --processes | No       | 1/4 of system cores | Number of processes to use for matching. Setting 1 disables multiple processes                                                 |
 | --delete    | No       | False               | If provided, one document of a matched pair above the ratio will be deleted.                                                   |
-| --url       | No       | blank               | If an instance URL is provided, the output table will show URLs to each documents instead of the document ID and name.         |

 !!! warning

@@ -948,11 +948,10 @@ for display in the web interface.

    !!! note

-        The **remote OCR parser** (Azure AI) also honors this setting: when
-        no archive is requested (`never`, or `auto` with a born-digital PDF),
-        the remote engine is skipped entirely and locally-extracted text is
-        used instead, avoiding an unnecessary API call and a duplicate text
-        layer.
+        The **remote OCR parser** (Azure AI) always produces a searchable
+        PDF and stores it as the archive copy, regardless of this setting.
+        `ARCHIVE_FILE_GENERATION=never` has no effect when the remote
+        parser handles a document.

 #### [`PAPERLESS_OCR_CLEAN=<mode>`](#PAPERLESS_OCR_CLEAN) {#PAPERLESS_OCR_CLEAN}

@@ -187,11 +187,10 @@ PAPERLESS_ARCHIVE_FILE_GENERATION=auto

 ### Remote OCR parser

-If you use the **remote OCR parser** (Azure AI), `ARCHIVE_FILE_GENERATION` is
-honored the same way as for the local engine: when no archive is requested
-(`never`, or `auto` with a born-digital PDF), the remote engine is skipped
-entirely and locally-extracted text is used instead, avoiding an unnecessary
-API call and a duplicate text layer.
+If you use the **remote OCR parser** (Azure AI), note that it always produces a
+searchable PDF and stores it as the archive copy. `ARCHIVE_FILE_GENERATION=never`
+has no effect for documents handled by the remote parser - the archive is produced
+unconditionally by the remote engine.

 ## Search Index (Whoosh -> Tantivy)

@@ -576,9 +576,7 @@ The following workflow action types are available:
 - Tags, correspondent, document type and storage path
 - Document owner
 - View and / or edit permissions to users or groups
- Custom fields, optionally with a value. If no value is set, the field is only added to the
-  document and any value it may already have is left untouched. If a value is set, it will
-  overwrite an existing value of that field on the document.
+- Custom fields. Note that no value for the field will be set

 ##### Removal {#workflow-action-removal}

@@ -66,5 +66,5 @@
    "ts-node": "~10.9.1",
    "typescript": "^6.0.3"
  },
-  "packageManager": "pnpm@11.15.1"
+  "packageManager": "pnpm@10.26.0"
 }
@@ -5,7 +5,6 @@ trustPolicy: no-downgrade
 trustPolicyExclude:
  - "chokidar@4.0.3"
  - "semver@6.3.1 || 5.7.2"
-blockExoticSubdeps: true
 allowBuilds:
  "@parcel/watcher": true
  canvas: true
@@ -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()
@@ -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()
@@ -111,7 +111,7 @@
                    routerLinkActive="active" (click)="closeMenu()" [ngbPopover]="view.name"
                    [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>
+                    <i-bs class="me-2" name="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) {
                          <span class="badge bg-info text-dark ms-2 d-inline">{{ savedViewService.getDocumentCount(view) }}</span>
                        }
@@ -19,11 +19,6 @@
    height: 0.8em;
  }

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

  .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;
@@ -86,7 +80,7 @@ main {

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

@media(min-width: 768px) {
@@ -154,7 +148,7 @@ main {
    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 {
@@ -186,8 +180,6 @@ main {
 .sidebar .nav-link {
  font-weight: 500;
  white-space: nowrap;
-  border-left: 2px solid transparent;
-  transition: color .15s ease-in-out;

  &:hover, &.active, &:focus {
    color: var(--bs-primary);
@@ -200,7 +192,6 @@ main {

  &.active {
    font-weight: bold;
-    border-left-color: var(--bs-primary);
  }

  i-bs {
@@ -209,17 +200,6 @@ main {
  }
 }

-// sub-page gets marker only
-.nav-item:has(.attributes-submenu.show .nav-link.active) > .attributes-row > .nav-link.active {
-  border-left-color: transparent;
-}
-
-// bring sub-menu markers back out to L edge
-.attributes-submenu .nav-link {
-  margin-left: -0.5rem;
-  padding-left: calc(var(--bs-nav-link-padding-x) + 0.5rem);
-}
-
 .attributes-row .attributes-expand-btn {
  opacity: 0.2;
  transition: opacity 0.15s ease-in-out;
@@ -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
@@ -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>
@@ -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,4 +1,4 @@
-<div class="btn-group w-100" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #dropdown="ngbDropdown" (keydown)="listKeyDown($event)" [popperOptions]="popperOptions" [autoClose]="!creating()">
+<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) {
@@ -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()
    }
  }
@@ -52,10 +52,10 @@ describe('CustomFieldsValuesComponent', () => {
  })

  it('should set selectedFields and map values correctly', () => {
-    component.value = { 1: 'value1', 3: 0, 4: false }
-    component.selectedFields = [1, 2, 3, 4]
-    expect(component.selectedFields).toEqual([1, 2, 3, 4])
-    expect(component.value).toEqual({ 1: 'value1', 2: null, 3: 0, 4: false })
+    component.value = { 1: 'value1' }
+    component.selectedFields = [1, 2]
+    expect(component.selectedFields).toEqual([1, 2])
+    expect(component.value).toEqual({ 1: 'value1', 2: null })
  })

  it('should return the correct custom field by id', () => {
@@ -77,7 +77,7 @@ export class CustomFieldsValuesComponent extends AbstractInputComponent<Object>
    this._selectedFields = newFields
    // map the selected fields to an object with field_id as key and value as value
    this.value = newFields.reduce((acc, fieldId) => {
-      acc[fieldId] = this.value?.[fieldId] ?? null
+      acc[fieldId] = this.value?.[fieldId] || null
      return acc
    }, {})
    this.onChange(this.value)
@@ -36,16 +36,7 @@
          (focus)="clearLastSearchTerm()"
          (clear)="clearLastSearchTerm()"
          (blur)="onBlur()">
-          <ng-template ng-label-tmp let-item="item">
-            @if (iconField && item[iconField]) {
-              <i-bs class="me-2" [name]="item[iconField]"></i-bs>
-            }
-            <span [title]="item[bindLabel]">{{item[bindLabel]}}</span>
-          </ng-template>
          <ng-template ng-option-tmp let-item="item">
-              @if (iconField && item[iconField]) {
-                <i-bs class="me-2" [name]="item[iconField]"></i-bs>
-              }
              <span [title]="item[bindLabel]">{{item[bindLabel]}}</span>
          </ng-template>
        </ng-select>
@@ -35,7 +35,7 @@ import { AbstractInputComponent } from '../abstract-input'
    NgxBootstrapIconsModule,
  ],
 })
-export class SelectComponent extends AbstractInputComponent<number | string> {
+export class SelectComponent extends AbstractInputComponent<number> {
  constructor() {
    super()
    this.addItemRef = this.addItem.bind(this)
@@ -100,9 +100,6 @@ export class SelectComponent extends AbstractInputComponent<number | string> {
  @Input()
  bindLabel: string = 'name'

-  @Input()
-  iconField: string
-
  public searchFn = (term: string, item: any): boolean =>
    matchesSearchText(item?.[this.bindLabel], term)

@@ -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>
@@ -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', () => {
@@ -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,7 +1,6 @@
 <pngx-widget-frame
  *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Document }"
  [title]="savedView.name"
-  [titleIcon]="savedView.icon || 'funnel'"
  [loading]="false"
  [draggable]="savedView"
  >
@@ -8,12 +8,7 @@
              <i-bs name="grip-vertical"></i-bs>
            </div>
          }
-          <h6 class="card-title mb-0">
-            @if (titleIcon()) {
-              <i-bs class="me-2" [name]="titleIcon()"></i-bs>
-            }
-            {{title()}}
-          </h6>
+          <h6 class="card-title mb-0">{{title()}}</h6>
          <ng-content select="[title-badge]"></ng-content>
          @if (badge() !== null && badge() !== undefined) {
            <span class="badge bg-info text-dark ms-2">{{badge()}}</span>
@@ -16,8 +16,6 @@ export class WidgetFrameComponent implements AfterViewInit {

  title = input<string>()

-  titleIcon = input<string>()
-
  draggable = input<any>()

  cardless = input(false)
@@ -1564,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()
  })
@@ -1789,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', () => {
@@ -659,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()
    })
@@ -1374,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())
        })
      )
@@ -1386,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)
        },
      })
@@ -1411,7 +1411,7 @@ 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] })
        .subscribe({
@@ -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`,
@@ -1798,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(),
@@ -1821,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`,
@@ -1855,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], {
@@ -1880,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`,
@@ -1683,7 +1683,7 @@ describe('BulkEditorComponent', () => {
          expiration_days: 7,
        },
        loading: signal(false),
-        buttonsEnabled: signal(true),
+        buttonsEnabled: true,
        copied: signal(false),
      },
    }
@@ -1715,7 +1715,7 @@ describe('BulkEditorComponent', () => {
      expiration_days: 7,
    })
    expect(dialogInstance.loading()).toBe(false)
-    expect(dialogInstance.buttonsEnabled()).toBe(false)
+    expect(dialogInstance.buttonsEnabled).toBe(false)
    expect(dialogInstance.createdBundle).toEqual({ id: 42 })
    expect(typeof dialogInstance.onOpenManage).toBe('function')
    expect(toastInfoSpy).toHaveBeenCalledWith(
@@ -1755,7 +1755,7 @@ describe('BulkEditorComponent', () => {
          expiration_days: null,
        },
        loading: signal(false),
-        buttonsEnabled: signal(true),
+        buttonsEnabled: true,
      },
    }

@@ -1777,7 +1777,7 @@ describe('BulkEditorComponent', () => {
      expect.any(Error)
    )
    expect(dialogInstance.loading()).toBe(false)
-    expect(dialogInstance.buttonsEnabled()).toBe(true)
+    expect(dialogInstance.buttonsEnabled).toBe(true)
    openSpy.mockRestore()
  })

@@ -273,7 +273,7 @@ export class BulkEditorComponent
    overrideSelection?: DocumentSelectionQuery
  ) {
    if (modal) {
-      modal.componentInstance.buttonsEnabled.set(false)
+      this.setModalButtonsEnabled(modal, false)
    }
    this.documentService
      .bulkEdit(overrideSelection ?? this.getSelectionQuery(), method, args)
@@ -290,7 +290,7 @@ export class BulkEditorComponent
    options: { deleteOriginals?: boolean } = {}
  ) {
    if (modal) {
-      modal.componentInstance.buttonsEnabled.set(false)
+      this.setModalButtonsEnabled(modal, false)
    }
    request.pipe(first()).subscribe({
      next: () => {
@@ -320,7 +320,7 @@ export class BulkEditorComponent

  private handleOperationError(modal: NgbModalRef, error: any) {
    if (modal) {
-      modal.componentInstance.buttonsEnabled.set(true)
+      this.setModalButtonsEnabled(modal, true)
    }
    this.toastService.showError(
      $localize`Error executing bulk operation`,
@@ -328,6 +328,15 @@ export class BulkEditorComponent
    )
  }

+  private setModalButtonsEnabled(modal: NgbModalRef, enabled: boolean) {
+    const buttonsEnabled = modal.componentInstance.buttonsEnabled
+    if (typeof buttonsEnabled?.set === 'function') {
+      buttonsEnabled.set(enabled)
+    } else {
+      modal.componentInstance.buttonsEnabled = enabled
+    }
+  }
+
  private applySelectionData(
    items: SelectionDataItem[],
    selectionModel: FilterableDropdownSelectionModel
@@ -762,7 +771,6 @@ export class BulkEditorComponent
        this.tagSelectionModel.items = flattenTags(tags.results)
        this.tagSelectionModel.toggle(newTag.id)
      })
-    return modal
  }

  createCorrespondent(name: string) {
@@ -786,7 +794,6 @@ export class BulkEditorComponent
        this.correspondentSelectionModel.items = correspondents.results
        this.correspondentSelectionModel.toggle(newCorrespondent.id)
      })
-    return modal
  }

  createDocumentType(name: string) {
@@ -808,7 +815,6 @@ export class BulkEditorComponent
        this.documentTypeSelectionModel.items = documentTypes.results
        this.documentTypeSelectionModel.toggle(newDocumentType.id)
      })
-    return modal
  }

  createStoragePath(name: string) {
@@ -830,7 +836,6 @@ export class BulkEditorComponent
        this.storagePathsSelectionModel.items = storagePaths.results
        this.storagePathsSelectionModel.toggle(newStoragePath.id)
      })
-    return modal
  }

  createCustomField(name: string) {
@@ -852,7 +857,6 @@ export class BulkEditorComponent
        this.customFieldsSelectionModel.items = customFields.results
        this.customFieldsSelectionModel.toggle(newCustomField.id)
      })
-    return modal
  }

  applyDelete() {
@@ -868,7 +872,7 @@ export class BulkEditorComponent
      modal.componentInstance.confirmClicked
        .pipe(takeUntil(this.unsubscribeNotifier))
        .subscribe(() => {
-          modal.componentInstance.buttonsEnabled.set(false)
+          modal.componentInstance.buttonsEnabled = false
          this.executeDocumentAction(
            modal,
            this.documentService.deleteDocuments(this.getSelectionQuery())
@@ -916,7 +920,7 @@ export class BulkEditorComponent
    modal.componentInstance.confirmClicked
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(() => {
-        modal.componentInstance.buttonsEnabled.set(false)
+        modal.componentInstance.buttonsEnabled = false
        this.executeDocumentAction(
          modal,
          this.documentService.reprocessDocuments(this.getSelectionQuery())
@@ -953,7 +957,7 @@ export class BulkEditorComponent
    rotateDialog.confirmClicked
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(() => {
-        rotateDialog.buttonsEnabled.set(false)
+        rotateDialog.buttonsEnabled = false
        this.executeDocumentAction(
          modal,
          this.documentService.rotateDocuments(
@@ -986,7 +990,7 @@ export class BulkEditorComponent
        if (mergeDialog.archiveFallback()) {
          args.archive_fallback = true
        }
-        mergeDialog.buttonsEnabled.set(false)
+        mergeDialog.buttonsEnabled = false
        this.executeDocumentAction(
          modal,
          this.documentService.mergeDocuments(mergeDialog.documentIDs(), args),
@@ -1059,14 +1063,14 @@ export class BulkEditorComponent
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(() => {
        dialog.loading.set(true)
-        dialog.buttonsEnabled.set(false)
+        dialog.buttonsEnabled = false
        this.shareLinkBundleService
          .createBundle(dialog.payload)
          .pipe(first())
          .subscribe({
            next: (result) => {
              dialog.loading.set(false)
-              dialog.buttonsEnabled.set(false)
+              dialog.buttonsEnabled = false
              dialog.createdBundle = result
              dialog.copied.set(false)
              dialog.payload = null
@@ -1080,7 +1084,7 @@ export class BulkEditorComponent
            },
            error: (error) => {
              dialog.loading.set(false)
-              dialog.buttonsEnabled.set(true)
+              dialog.buttonsEnabled = true
              this.toastService.showError(
                $localize`Share link bundle creation is not available yet.`,
                error
@@ -97,9 +97,7 @@
    <div class="dropdown-menu shadow dropdown-menu-right" ngbDropdownMenu>
      @if (!list.activeSavedViewId) {
        @for (view of savedViewService.allViews; track view) {
-          <button ngbDropdownItem (click)="loadViewConfig(view.id)">
-            <i-bs class="me-2" [name]="view.icon || 'funnel'"></i-bs>{{view.name}}
-          </button>
+          <button ngbDropdownItem (click)="loadViewConfig(view.id)">{{view.name}}</button>
        }
        @if (savedViewService.allViews.length > 0) {
          <div class="dropdown-divider"></div>
@@ -64,13 +64,6 @@ $paperless-card-breakpoints: (
  }
 }

-// Popper may place a dropdown above its toggle when the virtual keyboard
-// reduces the available viewport, increase the z-index so navbar doesn't
-// obscure it. See github.com/paperless-ngx/paperless-ngx/pull/13694
-:host ::ng-deep .sticky-top:has(.dropdown-menu.show) {
-  z-index: 1040;
-}
-
@media (max-width: 579.98px) {
  :host-context(main.mobile-search-hidden) .sticky-top {
    top: calc(3.5rem - 2px); // height of navbar only when search is hidden
@@ -457,7 +457,6 @@ export class DocumentListComponent
      modal.componentInstance.buttonsEnabled.set(false)
      let savedView: SavedView = {
        name: formValue.name,
-        icon: formValue.icon,
        filter_rules: this.list.filterRules,
        sort_reverse: this.list.sortReverse,
        sort_field: this.list.sortField,
@@ -6,14 +6,6 @@
  </div>
  <div class="modal-body">
    <pngx-input-text i18n-title title="Name" formControlName="name" [error]="error()?.name" autocomplete="off"></pngx-input-text>
-    <pngx-input-select
-      i18n-title
-      title="Icon"
-      formControlName="icon"
-      [items]="savedViewIcons"
-      iconField="icon"
-      [error]="error()?.icon">
-    </pngx-input-select>
    <pngx-input-check i18n-title title="Show in sidebar" formControlName="showInSideBar"></pngx-input-check>
    <pngx-input-check i18n-title title="Show on dashboard" formControlName="showOnDashboard"></pngx-input-check>
    <pngx-permissions-form accordion="true" formControlName="permissions_form"></pngx-permissions-form>
@@ -9,7 +9,6 @@ import { CheckComponent } from '../../common/input/check/check.component'
 import { PermissionsFormComponent } from '../../common/input/permissions/permissions-form/permissions-form.component'
 import { PermissionsGroupComponent } from '../../common/input/permissions/permissions-group/permissions-group.component'
 import { PermissionsUserComponent } from '../../common/input/permissions/permissions-user/permissions-user.component'
-import { SelectComponent } from '../../common/input/select/select.component'
 import { TextComponent } from '../../common/input/text/text.component'
 import { SaveViewConfigDialogComponent } from './save-view-config-dialog.component'

@@ -41,7 +40,6 @@ describe('SaveViewConfigDialogComponent', () => {
        ReactiveFormsModule,
        SaveViewConfigDialogComponent,
        TextComponent,
-        SelectComponent,
        CheckComponent,
        PermissionsFormComponent,
        PermissionsUserComponent,
@@ -65,7 +63,6 @@ describe('SaveViewConfigDialogComponent', () => {
    expect(component.defaultName()).toEqual(name)
    expect(result).toEqual({
      name,
-      icon: 'funnel',
      showInSideBar: false,
      showOnDashboard: false,
    })
@@ -97,7 +94,6 @@ describe('SaveViewConfigDialogComponent', () => {
    component.save()
    expect(result).toEqual({
      name,
-      icon: 'funnel',
      showInSideBar: true,
      showOnDashboard: true,
    })
@@ -117,7 +113,6 @@ describe('SaveViewConfigDialogComponent', () => {
    component.save()
    expect(result).toEqual({
      name: '',
-      icon: 'funnel',
      showInSideBar: false,
      showOnDashboard: false,
      permissions_form: permissions,
@@ -13,14 +13,9 @@ import {
  ReactiveFormsModule,
 } from '@angular/forms'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
-import {
-  DEFAULT_SAVED_VIEW_ICON,
-  SAVED_VIEW_ICONS,
-} from 'src/app/data/saved-view-icons'
 import { User } from 'src/app/data/user'
 import { CheckComponent } from '../../common/input/check/check.component'
 import { PermissionsFormComponent } from '../../common/input/permissions/permissions-form/permissions-form.component'
-import { SelectComponent } from '../../common/input/select/select.component'
 import { TextComponent } from '../../common/input/text/text.component'

@Component({
@@ -29,7 +24,6 @@ import { TextComponent } from '../../common/input/text/text.component'
  styleUrls: ['./save-view-config-dialog.component.scss'],
  imports: [
    CheckComponent,
-    SelectComponent,
    TextComponent,
    PermissionsFormComponent,
    FormsModule,
@@ -47,7 +41,6 @@ export class SaveViewConfigDialogComponent implements OnInit {
  public saveClicked = new EventEmitter()

  users: User[]
-  readonly savedViewIcons = SAVED_VIEW_ICONS

  setDefaultName(value: string) {
    this.defaultName.set(value)
@@ -56,7 +49,6 @@ export class SaveViewConfigDialogComponent implements OnInit {

  saveViewConfigForm = new FormGroup({
    name: new FormControl(''),
-    icon: new FormControl(DEFAULT_SAVED_VIEW_ICON),
    showInSideBar: new FormControl(false),
    showOnDashboard: new FormControl(false),
    permissions_form: new FormControl(null),
@@ -73,7 +65,6 @@ export class SaveViewConfigDialogComponent implements OnInit {
    const formValue = this.saveViewConfigForm.value
    const saveViewConfig = {
      name: formValue.name,
-      icon: formValue.icon,
      showInSideBar: formValue.showInSideBar,
      showOnDashboard: formValue.showOnDashboard,
    }
@@ -21,47 +21,45 @@
        <div class="col d-flex align-items-center"><button class="btn btn-link p-0 text-start" type="button" (click)="editField(field)" [disabled]="!permissionsService.currentUserCan(PermissionAction.Change, PermissionType.CustomField)">{{field.name}}</button></div>
        <div class="col d-flex align-items-center">{{getDataType(field)}}</div>
        <div class="col">
-          <div class="btn-toolbar gap-2">
-            <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>
-                  <i-bs name="three-dots-vertical"></i-bs>
-                </button>
-                <div ngbDropdownMenu aria-labelledby="actionsMenuMobile">
-                  <button (click)="editField(field)" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.CustomField }" ngbDropdownItem i18n>Edit</button>
-                  <button class="text-danger" (click)="deleteField(field)" *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.CustomField }" ngbDropdownItem i18n>Delete</button>
-                  @if (field.document_count > 0) {
-                    <a
-                      *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Document }"
-                      ngbDropdownItem
-                      [routerLink]="getDocumentFilterUrl(field)"
-                      i18n
-                      >Filter Documents ({{ field.document_count }})</a
-                    >
-                  }
-                </div>
+          <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>
+                <i-bs name="three-dots-vertical"></i-bs>
+              </button>
+              <div ngbDropdownMenu aria-labelledby="actionsMenuMobile">
+                <button (click)="editField(field)" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.CustomField }" ngbDropdownItem i18n>Edit</button>
+                <button class="text-danger" (click)="deleteField(field)" *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.CustomField }" ngbDropdownItem i18n>Delete</button>
+                @if (field.document_count > 0) {
+                  <a
+                    *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Document }"
+                    ngbDropdownItem
+                    [routerLink]="getDocumentFilterUrl(field)"
+                    i18n
+                    >Filter Documents ({{ field.document_count }})</a
+                  >
+                }
              </div>
            </div>
-            <div class="btn-group d-none d-sm-inline-block">
-              <button *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.CustomField }" class="btn btn-sm btn-outline-secondary" type="button" (click)="editField(field)">
-                <i-bs width="1em" height="1em" name="pencil" class="me-1"></i-bs><ng-container i18n>Edit</ng-container>
-              </button>
-              <button *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.CustomField }" class="btn btn-sm btn-outline-danger" type="button" (click)="deleteField(field)">
-                <i-bs width="1em" height="1em" name="trash" class="me-1"></i-bs><ng-container i18n>Delete</ng-container>
-              </button>
-            </div>
-            @if (field.document_count > 0) {
-              <div class="btn-group d-none d-sm-inline-block">
-                <a
-                  class="btn btn-sm btn-outline-secondary"
-                  [routerLink]="getDocumentFilterUrl(field)"
-                >
-                  <i-bs width="1em" height="1em" name="filter" class="me-1"></i-bs><ng-container i18n>Documents</ng-container
-                  ><span class="badge bg-light text-secondary ms-2">{{ field.document_count }}</span>
-                </a>
-              </div>
-            }
          </div>
+          <div class="btn-group d-none d-sm-inline-block">
+            <button *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.CustomField }" class="btn btn-sm btn-outline-secondary" type="button" (click)="editField(field)">
+              <i-bs width="1em" height="1em" name="pencil" class="me-1"></i-bs><ng-container i18n>Edit</ng-container>
+            </button>
+            <button *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.CustomField }" class="btn btn-sm btn-outline-danger" type="button" (click)="deleteField(field)">
+              <i-bs width="1em" height="1em" name="trash" class="me-1"></i-bs><ng-container i18n>Delete</ng-container>
+            </button>
+          </div>
+          @if (field.document_count > 0) {
+            <div class="btn-group d-none d-sm-inline-block ms-2">
+              <a
+                class="btn btn-sm btn-outline-secondary"
+                [routerLink]="getDocumentFilterUrl(field)"
+              >
+                <i-bs width="1em" height="1em" name="filter" class="me-1"></i-bs><ng-container i18n>Documents</ng-container
+                ><span class="badge bg-light text-secondary ms-2">{{ field.document_count }}</span>
+              </a>
+            </div>
+          }
        </div>
      </div>
    </li>
@@ -105,7 +105,7 @@ export class CustomFieldsComponent
    modal.componentInstance.btnClass = 'btn-danger'
    modal.componentInstance.btnCaption = $localize`Proceed`
    modal.componentInstance.confirmClicked.subscribe(() => {
-      modal.componentInstance.buttonsEnabled.set(false)
+      modal.componentInstance.buttonsEnabled = false
      this.customFieldsService.delete(field).subscribe({
        next: () => {
          modal.close()
@@ -69,7 +69,7 @@
  }
 </ul>

-<div class="my-3">
+<div class="my-3 shadow-sm">
  <ng-container
    [ngComponentOutlet]="activeSection?.component"
    #activeOutlet="ngComponentOutlet"
@@ -274,7 +274,7 @@ export abstract class ManagementListComponent<T extends MatchingModel>
    activeModal.componentInstance.btnClass = 'btn-danger'
    activeModal.componentInstance.btnCaption = $localize`Delete`
    activeModal.componentInstance.confirmClicked.subscribe(() => {
-      activeModal.componentInstance.buttonsEnabled.set(false)
+      activeModal.componentInstance.buttonsEnabled = false
      this.service
        .delete(object)
        .pipe(takeUntil(this.unsubscribeNotifier))
@@ -284,7 +284,7 @@ export abstract class ManagementListComponent<T extends MatchingModel>
            this.reloadData()
          },
          error: (error) => {
-            activeModal.componentInstance.buttonsEnabled.set(true)
+            activeModal.componentInstance.buttonsEnabled = true
            this.toastService.showError(
              $localize`Error while deleting element`,
              error
@@ -455,7 +455,7 @@ export abstract class ManagementListComponent<T extends MatchingModel>
    modal.componentInstance.btnClass = 'btn-danger'
    modal.componentInstance.btnCaption = $localize`Proceed`
    modal.componentInstance.confirmClicked.subscribe(() => {
-      modal.componentInstance.buttonsEnabled.set(false)
+      modal.componentInstance.buttonsEnabled = false
      this.service
        .bulk_edit_objects(
          this.allSelectionActive ? [] : Array.from(this.selectedObjects),
@@ -472,7 +472,7 @@ export abstract class ManagementListComponent<T extends MatchingModel>
            this.reloadData()
          },
          error: (error) => {
-            modal.componentInstance.buttonsEnabled.set(true)
+            modal.componentInstance.buttonsEnabled = true
            this.toastService.showError(
              $localize`Error deleting objects`,
              error
@@ -196,7 +196,7 @@ export class MailComponent
    modal.componentInstance.btnClass = 'btn-danger'
    modal.componentInstance.btnCaption = $localize`Proceed`
    modal.componentInstance.confirmClicked.subscribe(() => {
-      modal.componentInstance.buttonsEnabled.set(false)
+      modal.componentInstance.buttonsEnabled = false
      this.mailAccountService.delete(account).subscribe({
        next: () => {
          modal.close()
@@ -298,7 +298,7 @@ export class MailComponent
    modal.componentInstance.btnClass = 'btn-danger'
    modal.componentInstance.btnCaption = $localize`Proceed`
    modal.componentInstance.confirmClicked.subscribe(() => {
-      modal.componentInstance.buttonsEnabled.set(false)
+      modal.componentInstance.buttonsEnabled = false
      this.mailRuleService.delete(rule).subscribe({
        next: () => {
          modal.close()
@@ -7,24 +7,15 @@
 </pngx-page-header>
 <form [formGroup]="savedViewsForm" (ngSubmit)="save()">
  <ul class="list-group mb-3" formGroupName="savedViews">
-    @for (view of pagedSavedViews(); track view) {
+    @for (view of savedViews(); track view) {
      <li class="list-group-item py-3">
      <div [formGroupName]="view.id">
        <div class="row">
-          <div class="col-md">
+          <div class="col">
            <pngx-input-text title="Name" formControlName="name"></pngx-input-text>
          </div>
-          <div class="col-md">
-            <pngx-input-select
-            i18n-title
-            title="Icon"
-            formControlName="icon"
-            [items]="savedViewIcons"
-            iconField="icon">
-            </pngx-input-select>
-          </div>
          @if (canSaveSettings) {
-            <div class="col-md">
+            <div class="col">
              <div class="form-check form-switch mt-3">
                <input type="checkbox" class="form-check-input" id="show_on_dashboard_{{view.id}}" formControlName="show_on_dashboard">
                <label class="form-check-label" for="show_on_dashboard_{{view.id}}" i18n>Show on dashboard</label>
@@ -90,11 +81,6 @@
    }
  </ul>

-  <div class="d-flex align-items-center mb-3">
-    <button type="button" (click)="reset()" class="btn btn-outline-secondary mb-2" [disabled]="(isDirty$ | async) === false" i18n>Cancel</button>
-    <button type="submit" class="btn btn-primary ms-2 mb-2" [disabled]="(isDirty$ | async) === false" i18n>Save</button>
-    @if (savedViews()?.length > pageSize) {
-      <ngb-pagination class="ms-auto" [pageSize]="pageSize" [collectionSize]="savedViews().length" [page]="page()" [maxSize]="5" (pageChange)="page.set($event)" size="sm" aria-label="Pagination"></ngb-pagination>
-    }
-  </div>
+  <button type="button" (click)="reset()" class="btn btn-outline-secondary mb-2" [disabled]="(isDirty$ | async) === false" i18n>Cancel</button>
+  <button type="submit" class="btn btn-primary ms-2 mb-2" [disabled]="(isDirty$ | async) === false" i18n>Save</button>
 </form>
@@ -4,7 +4,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { signal } from '@angular/core'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import { By } from '@angular/platform-browser'
 import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { Subject, of, throwError } from 'rxjs'
@@ -26,20 +25,8 @@ import { PageHeaderComponent } from '../../common/page-header/page-header.compon
 import { SavedViewsComponent } from './saved-views.component'

 const savedViews = [
-  {
-    id: 1,
-    name: 'view1',
-    icon: 'archive',
-    show_in_sidebar: true,
-    show_on_dashboard: true,
-  },
-  {
-    id: 2,
-    name: 'view2',
-    icon: 'funnel',
-    show_in_sidebar: false,
-    show_on_dashboard: false,
-  },
+  { id: 1, name: 'view1', show_in_sidebar: true, show_on_dashboard: true },
+  { id: 2, name: 'view2', show_in_sidebar: false, show_on_dashboard: false },
 ]

 describe('SavedViewsComponent', () => {
@@ -170,24 +157,6 @@ describe('SavedViewsComponent', () => {
    expect(patchBody.show_in_sidebar).toBeUndefined()
  })

-  it('should persist a changed icon', () => {
-    const patchSpy = jest.spyOn(savedViewService, 'patchMany')
-    const view = savedViews[0]
-    const iconControl = component.savedViewsForm
-      .get('savedViews')
-      .get(view.id.toString())
-      .get('icon')
-
-    iconControl.setValue('bell')
-    iconControl.markAsDirty()
-    component.save()
-
-    expect(patchSpy.mock.calls[0][0][0]).toMatchObject({
-      id: view.id,
-      icon: 'bell',
-    })
-  })
-
  it('should persist visibility changes to user settings', () => {
    const patchSpy = jest.spyOn(savedViewService, 'patchMany')
    const updateVisibilitySpy = jest
@@ -253,44 +222,6 @@ describe('SavedViewsComponent', () => {
    ).toEqual(view.show_on_dashboard)
  })

-  it('should page saved views, clamp the page if views are removed', () => {
-    const manyViews = Array.from({ length: 30 }, (_, i) => ({
-      id: i + 1,
-      name: `view${i + 1}`,
-    })) as SavedView[]
-    const listSpy = jest.spyOn(savedViewService, 'list').mockReturnValue(
-      of({
-        all: manyViews.map((v) => v.id),
-        count: manyViews.length,
-        results: manyViews.concat([]),
-      })
-    )
-    component.ngOnInit()
-    fixture.detectChanges()
-    expect(listSpy).toHaveBeenCalledWith(1, 100000, null, false, {
-      full_perms: true,
-    })
-    expect(component.pagedSavedViews()).toHaveLength(25)
-    expect(fixture.debugElement.query(By.css('ngb-pagination'))).not.toBeNull()
-    // all views have controls, not just the current page
-    expect(
-      Object.keys(component.savedViewsForm.get('savedViews').value)
-    ).toHaveLength(30)
-
-    component.page.set(2)
-    expect(component.pagedSavedViews()).toHaveLength(5)
-
-    listSpy.mockReturnValue(
-      of({
-        all: manyViews.slice(0, 25).map((v) => v.id),
-        count: 25,
-        results: manyViews.slice(0, 25),
-      })
-    )
-    component.ngOnInit()
-    expect(component.page()).toEqual(1)
-  })
-
  it('should support editing permissions', () => {
    const confirmClicked = new Subject<any>()
    const modalRef = {
@@ -1,29 +1,18 @@
 import { AsyncPipe } from '@angular/common'
-import {
-  Component,
-  OnDestroy,
-  OnInit,
-  computed,
-  inject,
-  signal,
-} from '@angular/core'
+import { Component, OnDestroy, OnInit, inject, signal } from '@angular/core'
 import {
  FormControl,
  FormGroup,
  FormsModule,
  ReactiveFormsModule,
 } from '@angular/forms'
-import { NgbModal, NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap'
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { dirtyCheck } from '@ngneat/dirty-check-forms'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { BehaviorSubject, Observable, of, switchMap, takeUntil } from 'rxjs'
 import { PermissionsDialogComponent } from 'src/app/components/common/permissions-dialog/permissions-dialog.component'
 import { DisplayMode } from 'src/app/data/document'
 import { SavedView } from 'src/app/data/saved-view'
-import {
-  DEFAULT_SAVED_VIEW_ICON,
-  SAVED_VIEW_ICONS,
-} from 'src/app/data/saved-view-icons'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import {
  PermissionAction,
@@ -36,7 +25,6 @@ import { ToastService } from 'src/app/services/toast.service'
 import { ConfirmButtonComponent } from '../../common/confirm-button/confirm-button.component'
 import { DragDropSelectComponent } from '../../common/input/drag-drop-select/drag-drop-select.component'
 import { NumberComponent } from '../../common/input/number/number.component'
-import { SelectComponent } from '../../common/input/select/select.component'
 import { TextComponent } from '../../common/input/text/text.component'
 import { PageHeaderComponent } from '../../common/page-header/page-header.component'
 import { LoadingComponentWithPermissions } from '../../loading-component/loading.component'
@@ -48,14 +36,12 @@ import { LoadingComponentWithPermissions } from '../../loading-component/loading
    PageHeaderComponent,
    ConfirmButtonComponent,
    NumberComponent,
-    SelectComponent,
    TextComponent,
    IfPermissionsDirective,
    DragDropSelectComponent,
    FormsModule,
    ReactiveFormsModule,
    AsyncPipe,
-    NgbPaginationModule,
    NgxBootstrapIconsModule,
  ],
 })
@@ -70,17 +56,8 @@ export class SavedViewsComponent
  private readonly modalService = inject(NgbModal)

  DisplayMode = DisplayMode
-  readonly savedViewIcons = SAVED_VIEW_ICONS

  readonly savedViews = signal<SavedView[]>(undefined)
-  readonly page = signal(1)
-  public readonly pageSize = 25
-  // All views are loaded at init, so paging is only for display
-  readonly pagedSavedViews = computed(() => {
-    const start = (this.page() - 1) * this.pageSize
-    return this.savedViews()?.slice(start, start + this.pageSize)
-  })
-
  private savedViewsGroup = new FormGroup({})
  public savedViewsForm: FormGroup = new FormGroup({
    savedViews: this.savedViewsGroup,
@@ -107,11 +84,9 @@ export class SavedViewsComponent
  private reloadViews(): void {
    this.loading.set(true)
    this.savedViewService
-      .list(1, 100000, null, false, { full_perms: true })
+      .list(null, null, null, false, { full_perms: true })
      .subscribe((r) => {
        this.savedViews.set(r.results)
-        const pageCount = Math.ceil(r.results.length / this.pageSize)
-        this.page.update((page) => Math.min(page, Math.max(1, pageCount)))
        this.initialize()
      })
  }
@@ -135,7 +110,6 @@ export class SavedViewsComponent
      storeData.savedViews[view.id.toString()] = {
        id: view.id,
        name: view.name,
-        icon: view.icon ?? DEFAULT_SAVED_VIEW_ICON,
        show_on_dashboard: view.show_on_dashboard,
        show_in_sidebar: view.show_in_sidebar,
        page_size: view.page_size,
@@ -148,7 +122,6 @@ export class SavedViewsComponent
        new FormGroup({
          id: new FormControl({ value: null, disabled: !canEdit }),
          name: new FormControl({ value: null, disabled: !canEdit }),
-          icon: new FormControl({ value: null, disabled: !canEdit }),
          show_on_dashboard: new FormControl({
            value: null,
            disabled: false,
@@ -227,7 +200,6 @@ export class SavedViewsComponent

      const modelFieldsChanged =
        group.get('name')?.dirty ||
-        group.get('icon')?.dirty ||
        group.get('page_size')?.dirty ||
        group.get('display_mode')?.dirty ||
        group.get('display_fields')?.dirty
@@ -134,7 +134,7 @@ export class WorkflowsComponent
    modal.componentInstance.btnClass = 'btn-danger'
    modal.componentInstance.btnCaption = $localize`Proceed`
    modal.componentInstance.confirmClicked.subscribe(() => {
-      modal.componentInstance.buttonsEnabled.set(false)
+      modal.componentInstance.buttonsEnabled = false
      this.workflowService.delete(workflow).subscribe({
        next: () => {
          modal.close()
@@ -1,89 +0,0 @@
-export const DEFAULT_SAVED_VIEW_ICON = 'funnel'
-
-export const SAVED_VIEW_ICONS = [
-  { id: 'archive', name: $localize`Archive`, icon: 'archive' },
-  { id: 'bank', name: $localize`Bank`, icon: 'bank' },
-  { id: 'basket', name: $localize`Basket`, icon: 'basket' },
-  { id: 'bell', name: $localize`Bell`, icon: 'bell' },
-  { id: 'bookmark', name: $localize`Bookmark`, icon: 'bookmark' },
-  { id: 'boxes', name: $localize`Boxes`, icon: 'boxes' },
-  { id: 'briefcase', name: $localize`Briefcase`, icon: 'briefcase' },
-  { id: 'building', name: $localize`Building`, icon: 'building' },
-  { id: 'calculator', name: $localize`Calculator`, icon: 'calculator' },
-  { id: 'calendar', name: $localize`Calendar`, icon: 'calendar' },
-  { id: 'camera', name: $localize`Camera`, icon: 'camera' },
-  {
-    id: 'card-checklist',
-    name: $localize`Checklist`,
-    icon: 'card-checklist',
-  },
-  { id: 'cash', name: $localize`Cash`, icon: 'cash' },
-  { id: 'chat-left-text', name: $localize`Chat`, icon: 'chat-left-text' },
-  { id: 'check-circle', name: $localize`Check`, icon: 'check-circle' },
-  { id: 'clipboard', name: $localize`Clipboard`, icon: 'clipboard' },
-  { id: 'clock-history', name: $localize`Clock`, icon: 'clock-history' },
-  { id: 'credit-card', name: $localize`Credit card`, icon: 'credit-card' },
-  { id: 'download', name: $localize`Download`, icon: 'download' },
-  { id: 'envelope', name: $localize`Envelope`, icon: 'envelope' },
-  {
-    id: 'exclamation-triangle',
-    name: $localize`Warning`,
-    icon: 'exclamation-triangle',
-  },
-  { id: 'file-earmark', name: $localize`File`, icon: 'file-earmark' },
-  {
-    id: 'file-earmark-check',
-    name: $localize`Checked file`,
-    icon: 'file-earmark-check',
-  },
-  {
-    id: 'file-earmark-lock',
-    name: $localize`Locked file`,
-    icon: 'file-earmark-lock',
-  },
-  {
-    id: 'file-earmark-medical',
-    name: $localize`Medical file`,
-    icon: 'file-earmark-medical',
-  },
-  {
-    id: 'file-earmark-person',
-    name: $localize`Person file`,
-    icon: 'file-earmark-person',
-  },
-  {
-    id: 'file-earmark-spreadsheet',
-    name: $localize`Spreadsheet`,
-    icon: 'file-earmark-spreadsheet',
-  },
-  { id: 'file-text', name: $localize`Text file`, icon: 'file-text' },
-  { id: 'files', name: $localize`Files`, icon: 'files' },
-  { id: 'folder', name: $localize`Folder`, icon: 'folder' },
-  { id: 'funnel', name: $localize`Filter`, icon: 'funnel' },
-  { id: 'gear', name: $localize`Gear`, icon: 'gear' },
-  { id: 'globe2', name: $localize`Globe`, icon: 'globe2' },
-  { id: 'hash', name: $localize`Hash`, icon: 'hash' },
-  { id: 'heart', name: $localize`Heart`, icon: 'heart' },
-  { id: 'house', name: $localize`House`, icon: 'house' },
-  { id: 'inbox', name: $localize`Inbox`, icon: 'inbox' },
-  { id: 'journals', name: $localize`Journals`, icon: 'journals' },
-  { id: 'list-task', name: $localize`Task list`, icon: 'list-task' },
-  { id: 'newspaper', name: $localize`Newspaper`, icon: 'newspaper' },
-  { id: 'paperclip', name: $localize`Attachment`, icon: 'paperclip' },
-  { id: 'people', name: $localize`People`, icon: 'people' },
-  { id: 'person', name: $localize`Person`, icon: 'person' },
-  { id: 'printer', name: $localize`Printer`, icon: 'printer' },
-  { id: 'receipt', name: $localize`Receipt`, icon: 'receipt' },
-  { id: 'safe', name: $localize`Safe`, icon: 'safe' },
-  { id: 'search', name: $localize`Search`, icon: 'search' },
-  { id: 'send', name: $localize`Send`, icon: 'send' },
-  { id: 'shop', name: $localize`Shop`, icon: 'shop' },
-  { id: 'stack', name: $localize`Stack`, icon: 'stack' },
-  { id: 'stars', name: $localize`Stars`, icon: 'stars' },
-  { id: 'tag', name: $localize`Tag`, icon: 'tag' },
-  { id: 'tags', name: $localize`Tags`, icon: 'tags' },
-  { id: 'telephone', name: $localize`Telephone`, icon: 'telephone' },
-  { id: 'truck', name: $localize`Truck`, icon: 'truck' },
-  { id: 'upc-scan', name: $localize`Barcode`, icon: 'upc-scan' },
-  { id: 'wallet2', name: $localize`Wallet`, icon: 'wallet2' },
-]
@@ -5,8 +5,6 @@ import { ObjectWithPermissions } from './object-with-permissions'
 export interface SavedView extends ObjectWithPermissions {
  name?: string

-  icon?: string
-
  show_on_dashboard?: boolean

  show_in_sidebar?: boolean
@@ -18,7 +18,7 @@ export class DirtyFormGuard extends DirtyCheckGuard {
    modal.componentInstance.btnClass = 'btn-warning'
    modal.componentInstance.btnCaption = $localize`Leave page`
    modal.componentInstance.confirmClicked.subscribe(() => {
-      modal.componentInstance.buttonsEnabled.set(false)
+      modal.componentInstance.buttonsEnabled = false
      modal.close()
    })
    const subject = new Subject<boolean>()
@@ -36,12 +36,12 @@ export class DirtySavedViewGuard {
    modal.componentInstance.alternativeBtnClass = 'btn-primary'
    modal.componentInstance.alternativeBtnCaption = $localize`Save and close`
    modal.componentInstance.alternativeClicked.pipe(first()).subscribe(() => {
-      modal.componentInstance.buttonsEnabled.set(false)
+      modal.componentInstance.buttonsEnabled = false
      component.saveViewConfig()
      modal.close()
    })
    modal.componentInstance.confirmClicked.pipe(first()).subscribe(() => {
-      modal.componentInstance.buttonsEnabled.set(false)
+      modal.componentInstance.buttonsEnabled = false
      modal.close()
    })

@@ -142,7 +142,7 @@ export class OpenDocumentsService {
      modal.componentInstance.btnClass = 'btn-warning'
      modal.componentInstance.btnCaption = $localize`Close document`
      modal.componentInstance.confirmClicked.pipe(first()).subscribe(() => {
-        modal.componentInstance.buttonsEnabled.set(false)
+        modal.componentInstance.buttonsEnabled = false
        modal.close()
        this.openDocuments.splice(index, 1)
        this.dirtyDocuments.delete(doc.id)
@@ -165,7 +165,7 @@ export class OpenDocumentsService {
      modal.componentInstance.btnClass = 'btn-warning'
      modal.componentInstance.btnCaption = $localize`Close documents`
      modal.componentInstance.confirmClicked.pipe(first()).subscribe(() => {
-        modal.componentInstance.buttonsEnabled.set(false)
+        modal.componentInstance.buttonsEnabled = false
        modal.close()
        this.openDocuments.splice(0, this.openDocuments.length)
        this.dirtyDocuments.clear()
@@ -120,12 +120,6 @@ describe('PermissionsService', () => {
      actionKey: 'View', // PermissionAction.View
      typeKey: 'SystemMonitoring', // PermissionType.SystemMonitoring
    })
-    expect(permissionsService.getPermissionKeys('add_sharelinkbundle')).toEqual(
-      {
-        actionKey: 'Add', // PermissionAction.Add
-        typeKey: 'ShareLinkBundle', // PermissionType.ShareLinkBundle
-      }
-    )
  })

  it('correctly checks explicit global permissions', () => {
@@ -275,10 +269,6 @@ describe('PermissionsService', () => {
        'view_sharelink',
        'change_sharelink',
        'delete_sharelink',
-        'add_sharelinkbundle',
-        'view_sharelinkbundle',
-        'change_sharelinkbundle',
-        'delete_sharelinkbundle',
        'add_workflow',
        'view_workflow',
        'change_workflow',
@@ -26,7 +26,6 @@ export enum PermissionType {
  User = '%s_user',
  Group = '%s_group',
  ShareLink = '%s_sharelink',
-  ShareLinkBundle = '%s_sharelinkbundle',
  CustomField = '%s_customfield',
  Workflow = '%s_workflow',
  ProcessedMail = '%s_processedmail',
@@ -35,27 +35,19 @@ import {
  arrowRightShort,
  arrowUpRight,
  asterisk,
-  bank,
-  basket,
  bell,
  bodyText,
-  bookmark,
  boxArrowUp,
  boxArrowUpRight,
  boxes,
  braces,
-  briefcase,
-  building,
-  calculator,
  calendar,
  calendarEvent,
  calendarEventFill,
-  camera,
  cardChecklist,
  cardHeading,
  caretDown,
  caretUp,
-  cash,
  chatLeftText,
  chatSquareDots,
  check,
@@ -73,7 +65,6 @@ import {
  clipboardCheckFill,
  clipboardFill,
  clockHistory,
-  creditCard,
  dash,
  dashCircle,
  diagram3,
@@ -92,12 +83,9 @@ import {
  fileEarmarkDiff,
  fileEarmarkFill,
  fileEarmarkLock,
-  fileEarmarkMedical,
  fileEarmarkMinus,
-  fileEarmarkPerson,
  fileEarmarkPlus,
  fileEarmarkRichtext,
-  fileEarmarkSpreadsheet,
  fileText,
  files,
  filter,
@@ -105,15 +93,12 @@ import {
  folderFill,
  funnel,
  gear,
-  globe2,
  google,
  grid,
  gripVertical,
  hash,
  hddStack,
-  heart,
  house,
-  inbox,
  infoCircle,
  journals,
  link,
@@ -121,9 +106,7 @@ import {
  listTask,
  listUl,
  microsoft,
-  newspaper,
  nodePlus,
-  paperclip,
  pencil,
  people,
  peopleFill,
@@ -138,12 +121,9 @@ import {
  plusCircle,
  printer,
  questionCircle,
-  receipt,
-  safe,
  scissors,
  search,
  send,
-  shop,
  slashCircle,
  sliders2Vertical,
  sortAlphaDown,
@@ -153,17 +133,14 @@ import {
  tag,
  tagFill,
  tags,
-  telephone,
  textIndentLeft,
  textLeft,
  threeDots,
  threeDotsVertical,
  trash,
-  truck,
  uiRadios,
  unlock,
  upcScan,
-  wallet2,
  windowStack,
  x,
  xCircle,
@@ -281,22 +258,15 @@ const icons = {
  arrowRightShort,
  arrowUpRight,
  asterisk,
-  bank,
-  basket,
  bell,
  braces,
  bodyText,
-  bookmark,
  boxArrowUp,
  boxArrowUpRight,
  boxes,
-  briefcase,
-  building,
-  calculator,
  calendar,
  calendarEvent,
  calendarEventFill,
-  camera,
  cardChecklist,
  cardHeading,
  caretDown,
@@ -318,8 +288,6 @@ const icons = {
  clipboardCheckFill,
  clipboardFill,
  clockHistory,
-  cash,
-  creditCard,
  dash,
  dashCircle,
  diagram3,
@@ -338,12 +306,9 @@ const icons = {
  fileEarmarkDiff,
  fileEarmarkFill,
  fileEarmarkLock,
-  fileEarmarkMedical,
  fileEarmarkMinus,
-  fileEarmarkPerson,
  fileEarmarkPlus,
  fileEarmarkRichtext,
-  fileEarmarkSpreadsheet,
  files,
  fileText,
  filter,
@@ -351,15 +316,12 @@ const icons = {
  folderFill,
  funnel,
  gear,
-  globe2,
  google,
  grid,
  gripVertical,
  hash,
  hddStack,
-  heart,
  house,
-  inbox,
  infoCircle,
  journals,
  link,
@@ -367,10 +329,8 @@ const icons = {
  listTask,
  listUl,
  microsoft,
-  newspaper,
  nodePlus,
  pencil,
-  paperclip,
  people,
  peopleFill,
  person,
@@ -384,13 +344,10 @@ const icons = {
  plusCircle,
  printer,
  questionCircle,
-  receipt,
-  safe,
  scissors,
  search,
  send,
  slashCircle,
-  shop,
  sliders2Vertical,
  sortAlphaDown,
  sortAlphaUpAlt,
@@ -401,15 +358,12 @@ const icons = {
  tags,
  textIndentLeft,
  textLeft,
-  telephone,
  threeDots,
  threeDotsVertical,
  trash,
-  truck,
  uiRadios,
  unlock,
  upcScan,
-  wallet2,
  windowStack,
  x,
  xCircle,
@@ -127,27 +127,6 @@ table .btn-link {
  background-color: var(--bs-body-bg);
 }

-html {
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-h1, h2, h3, h4, h5, h6,
-.h1, .h2, .h3, .h4, .h5, .h6 {
-  font-weight: 600;
-}
-
-pngx-page-header h3 {
-  font-size: 1.5rem;
-}
-
-table,
-.badge,
-.card-info,
-.pagination {
-  font-variant-numeric: tabular-nums;
-}
-
 .bg-primary {
  background-color: var(--bs-primary) !important;
  color: var(--pngx-primary-text-contrast);
@@ -234,8 +213,7 @@ table,
 }

 .form-switch .form-check-input:focus {
-  // neutral knob in place of bootstrap's blue, which clashes with the theme colour
-  --bs-form-switch-bg: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%23bbb'/%3e%3c/svg%3e");
+  background-image: escape-svg(url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'><circle r='3' fill='#bbb'/></svg>"));
 }

 .nav-item a:focus-visible {
@@ -291,44 +269,33 @@ a.btn-link:focus-visible,
  box-shadow: 0 0 0 3px rgba(255, 255, 255, .25);
 }

-// Sortable table headers
-th[pngxSortable] {
-  cursor: pointer;
-  user-select: none;
-  white-space: nowrap;
-
-  &::after {
-    content: '';
-    display: inline-block;
-    vertical-align: -0.15em;
-    width: 0.8rem;
-    height: 0.8rem;
-    margin-left: 0.25rem;
-    // chevron, matched to the bootstrap-icons set used elsewhere in the app
-    mask: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e") no-repeat center / 0.8rem;
-    background-color: currentColor;
-    opacity: 0;
-    transition: opacity 0.15s ease-in-out;
-  }
-
-  // hint that an unsorted column can be sorted
-  &:hover::after {
-    opacity: 0.35;
-  }
+.asc {
+  background-color: #f8f9fa!important;
 }

-.asc,
-.des {
-  color: var(--bs-primary);
-  --bs-table-color-state: var(--bs-primary); // bootstrap sets cell color at higher specificity
-
-  &::after {
-    opacity: 1 !important;
-  }
-}
-
-.asc::after {
+.asc:after {
+  content: '';
  transform: rotate(180deg);
+  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAmxJREFUeAHtmksrRVEUx72fH8CIGQNJkpGUUmakDEiZSJRIZsRQmCkTJRmZmJgQE0kpX0D5DJKJgff7v+ru2u3O3vvc67TOvsdatdrnnP1Y///v7HvvubdbUiIhBISAEBACQkAICAEhIAQ4CXSh2DnyDfmCPEG2Iv9F9MPlM/LHyAecdyMzHYNwR3fdNK/OH9HXl1UCozD24TCvILxizEDWIEzA0FcM8woCgRrJCoS5PIwrANQSMAJX1LEI9bqpQo4JYNFFKRSvIgsxHDVnqZgIkPnNBM0rIGtYk9YOOsqgbgepRCfdbmFtqhFkVEDVPjJp0+Z6e6hRHhqBKgg6ZDCvYBygVmUoEGoh5JTRvIJwhJo1aUOoh4CLPMyvxxi7EWOMgnCGsXXI1GIXlZUYX7ucU+kbR8NW8lh3O7cue0Pk32MKndfUxQFAwxdirk3fHappAnc0oqDPzDfGTBrCfHP04dM4oTV8cxr0SVzH9FF07xD3ib6xCDE+M+aUcVygtWzzbtGX2rPBrEUYfecfQkaFzYi6HjVnGBdtL7epqAlc1+jRdAap74RrnPc4BCijttY2tRcdN0g17w7HqZrXhdJTYAuS3hd8z+vKgK3V1zWPae0mZDMykadBn1hTQBLnZNwVrJpSe/NwEeDsEwCctEOsJTsgxLvCqUl2ACftEGvJDgjxrnBqkh3ASTvEWrIDQrwrnJpkB3DSDrGW7IAQ7wqnJtkBnLRztejXXVu4+mxz/nQ9jR1w5VB86ejLTFcnnDwhzV+F6T+CHZlx6THSjn76eyyBIOPHyDakhBAQAkJACAgBISAEhIAQYCLwC8JxpAmsEGt6AAAAAElFTkSuQmCC") no-repeat;
+  height: 1rem;
+  width: 1rem;
+  display: block;
+  background-size: 1rem;
+  float: right;
+}
+
+.des {
+  background-color: #f8f9fa!important;
+}
+
+.des:after {
+  content: '';
+  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAmxJREFUeAHtmksrRVEUx72fH8CIGQNJkpGUUmakDEiZSJRIZsRQmCkTJRmZmJgQE0kpX0D5DJKJgff7v+ru2u3O3vvc67TOvsdatdrnnP1Y///v7HvvubdbUiIhBISAEBACQkAICAEhIAQ4CXSh2DnyDfmCPEG2Iv9F9MPlM/LHyAecdyMzHYNwR3fdNK/OH9HXl1UCozD24TCvILxizEDWIEzA0FcM8woCgRrJCoS5PIwrANQSMAJX1LEI9bqpQo4JYNFFKRSvIgsxHDVnqZgIkPnNBM0rIGtYk9YOOsqgbgepRCfdbmFtqhFkVEDVPjJp0+Z6e6hRHhqBKgg6ZDCvYBygVmUoEGoh5JTRvIJwhJo1aUOoh4CLPMyvxxi7EWOMgnCGsXXI1GIXlZUYX7ucU+kbR8NW8lh3O7cue0Pk32MKndfUxQFAwxdirk3fHappAnc0oqDPzDfGTBrCfHP04dM4oTV8cxr0SVzH9FF07xD3ib6xCDE+M+aUcVygtWzzbtGX2rPBrEUYfecfQkaFzYi6HjVnGBdtL7epqAlc1+jRdAap74RrnPc4BCijttY2tRcdN0g17w7HqZrXhdJTYAuS3hd8z+vKgK3V1zWPae0mZDMykadBn1hTQBLnZNwVrJpSe/NwEeDsEwCctEOsJTsgxLvCqUl2ACftEGvJDgjxrnBqkh3ASTvEWrIDQrwrnJpkB3DSDrGW7IAQ7wqnJtkBnLRztejXXVu4+mxz/nQ9jR1w5VB86ejLTFcnnDwhzV+F6T+CHZlx6THSjn76eyyBIOPHyDakhBAQAkJACAgBISAEhIAQYCLwC8JxpAmsEGt6AAAAAElFTkSuQmCC") no-repeat;
+  height: 1rem;
+  width: 1rem;
+  display: block;
+  background-size: 1rem;
+  float: right;
 }

 .paperless-input-select {
@@ -597,6 +564,10 @@ ul.pagination {
 table.table {
  --bs-table-color: var(--bs-body-color);
  --bs-table-bg: var(--bs-light-rgb);
+
+  .des,.asc {
+    background-color: var(--bs-body-bg) !important;
+  }
 }

 .close {
@@ -805,16 +776,6 @@ canvas.hiddenCanvasElement {

 .document-card {
  overflow: hidden;
-  transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
-
-  &:hover:not(.card-selected) {
-    border-color: var(--pngx-card-hover-border);
-    box-shadow: 0 0.125rem 0.5rem rgba(0, 0, 0, 0.1);
-  }
-
-  .document-card-check {
-    border-color: var(--pngx-card-hover-border) !important;
-  }

  .card-footer i-bs svg {
    vertical-align: middle;
@@ -23,7 +23,6 @@
  --pngx-bg-darker: var(--bs-gray-100);
  --pngx-bg-alt2: var(--bs-gray-200); // #e9ecef
  --pngx-bg-disabled: #f7f7f7;
-  --pngx-card-hover-border: var(--bs-tertiary-color);
  --pngx-focus-alpha: 0.3;
  --pngx-toast-max-width: 340px;
  --bs-info: var(--pngx-bg-alt2);
@@ -37,22 +36,20 @@
 $text-color-light-bg: #212529;
 $text-color-dark-bg: #abb2bf;
 $text-color-dark-bg-accent: color.adjust($text-color-dark-bg, $lightness: 10%);
-// url-encoded $text-color-light-bg
-$text-color-light-bg-esc: "%23212529";
-// Taken from bootstrap, pre-encoded
-$form-check-input-checked-bg-image-dark: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'%3e%3cpath fill='none' stroke='#{$text-color-light-bg-esc}' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='M6 10l3 3l6-6'/%3e%3c/svg%3e");
-$form-check-radio-checked-bg-image-dark: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='2' fill='#{$text-color-light-bg-esc}'/%3e%3c/svg%3e");
+// Taken from bootstrap
+$form-check-input-checked-bg-image-dark: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'><path fill='none' stroke='#{$text-color-light-bg}' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='M6 10l3 3l6-6'/></svg>");
+$form-check-radio-checked-bg-image-dark: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'><circle r='2' fill='#{$text-color-light-bg}'/></svg>");

 .primary-light {
  --pngx-primary-text-contrast: #{$text-color-light-bg} !important;

  .form-check:not(.form-switch) {
    .form-check-input:checked[type=checkbox] {
-      --bs-form-check-bg-image: #{$form-check-input-checked-bg-image-dark};
+      background-image: escape-svg($form-check-input-checked-bg-image-dark);
    }

    .form-check-input:checked[type=radio] {
-      --bs-form-check-bg-image: #{$form-check-radio-checked-bg-image-dark};
+      background-image: escape-svg($form-check-radio-checked-bg-image-dark);
    }
  }

@@ -69,17 +66,6 @@ $form-check-radio-checked-bg-image-dark: url("data:image/svg+xml,%3csvg xmlns='h
  color: var(--pngx-primary-text-contrast);
 }

-.dropdown-menu > .list-group-flush:only-child {
-  > .list-group-item:first-child {
-    border-top-left-radius: var(--bs-dropdown-border-radius);
-    border-top-right-radius: var(--bs-dropdown-border-radius);
-  }
-  > .list-group-item:last-child {
-    border-bottom-left-radius: var(--bs-dropdown-border-radius);
-    border-bottom-right-radius: var(--bs-dropdown-border-radius);
-  }
-}
-
 // Dark mode
@mixin paperless-green-dark-mode {
  --pngx-primary-lightness: 31%;
@@ -93,7 +79,6 @@ $form-check-radio-checked-bg-image-dark: url("data:image/svg+xml,%3csvg xmlns='h
  --pngx-bg-alt2: #232323;
  --pngx-bg-darker: #101216;
  --pngx-bg-disabled: var(--pngx-bg-alt);
-  --pngx-card-hover-border: var(--bs-border-color);
  --pngx-focus-alpha: 0.6;
  --pngx-primary-faded: var(--pngx-primary-darken-15);
  --pngx-primary-text-contrast: var(--bs-body-color);
@@ -253,6 +238,13 @@ $form-check-radio-checked-bg-image-dark: url("data:image/svg+xml,%3csvg xmlns='h
  }

  table {
+    .des,
+    .asc {
+      &::after {
+        filter: invert(0.8); /* arrow is a black inline png bkgd image (!) so use filter */
+      }
+    }
+
    &.table-hover > tbody > tr:hover > * {
      background-color: var(--bs-light);
      color: var(--pngx-body-color-accent);
@@ -41,16 +41,7 @@ class SuggestionCacheData:
 CLASSIFIER_VERSION_KEY: Final[str] = "classifier_version"
 CLASSIFIER_HASH_KEY: Final[str] = "classifier_hash"
 CLASSIFIER_MODIFIED_KEY: Final[str] = "classifier_modified"
-# Marker distinguishing LLM suggestions from classifier-generated ones (whose
-# FORMAT_VERSION lives in a much lower range - see DocumentClassifier). Bump
-# this whenever the *shape* of the cached `suggestions` dict changes, so a
-# cache entry written by a previous release can never be read back by code
-# that expects a different shape:
-#   1000 - initial LLM suggestions cache (flat lists of resolved object ids
-#          per taxonomy field)
-#   1001 - suggestions reshaped to {"existing_ids": [...], "new_names":
-#          [...]} per taxonomy field (#13676)
-LLM_CACHE_CLASSIFIER_VERSION: Final[int] = 1001
+LLM_CACHE_CLASSIFIER_VERSION: Final[int] = 1000  # Marker distinguishing LLM suggestions

 CACHE_1_MINUTE: Final[int] = 60
 CACHE_5_MINUTES: Final[int] = 5 * CACHE_1_MINUTE
@@ -213,11 +204,7 @@ def get_llm_suggestion_cache(
    doc_key = get_suggestion_cache_key(document_id)
    data: SuggestionCacheData = cache.get(doc_key)

-    if (
-        data
-        and data.classifier_version == LLM_CACHE_CLASSIFIER_VERSION
-        and data.classifier_hash == backend
-    ):
+    if data and data.classifier_hash == backend:
        return data

    return None
@@ -1,106 +0,0 @@
-from __future__ import annotations
-
-import importlib
-import zipfile
-
-# ZIP_ZSTANDARD exists only on Python 3.14+ (PEP 784). None elsewhere.
-ZSTD: int | None = getattr(zipfile, "ZIP_ZSTANDARD", None)
-
-# CLI choices are fixed across runtimes so argparse never hides zstd; runtime
-# availability is enforced separately in compression_available().
-COMPRESSION_CHOICES: tuple[str, ...] = (
-    "stored",
-    "deflated",
-    "bzip2",
-    "lzma",
-    "zstd",
-)
-
-# Method name -> zipfile compression constant (zstd only when supported).
-COMPRESSION_METHODS: dict[str, int] = {
-    "stored": zipfile.ZIP_STORED,
-    "deflated": zipfile.ZIP_DEFLATED,
-    "bzip2": zipfile.ZIP_BZIP2,
-    "lzma": zipfile.ZIP_LZMA,
-}
-if ZSTD is not None:
-    COMPRESSION_METHODS["zstd"] = ZSTD
-
-# Inclusive (min, max) level bounds per method; None => level not applicable.
-# Verified on CPython 3.14.3.
-#
-# zstd's raw library bounds are (-131072, 22)
-# (compression.zstd.CompressionParameter.compression_level.bounds()) — the
-# minimum is an internal implementation constant (-ZSTD_TARGETLENGTH_MAX),
-# not a meaningful distinct "level"; deeper negative values than -22 buy
-# nothing over -22 in practice. We expose the conventional zstd CLI range
-# instead of the raw library bounds.
-LEVEL_BOUNDS: dict[str, tuple[int, int] | None] = {
-    "stored": None,
-    "deflated": (0, 9),
-    "bzip2": (1, 9),
-    "lzma": None,
-    "zstd": (-22, 22),
-}
-
-# zipfile compress_type id -> method name.
-_COMPRESS_TYPE_TO_METHOD: dict[int, str] = {
-    zipfile.ZIP_STORED: "stored",
-    zipfile.ZIP_DEFLATED: "deflated",
-    zipfile.ZIP_BZIP2: "bzip2",
-    zipfile.ZIP_LZMA: "lzma",
-    93: "zstd",
-}
-
-
-def compression_available(method: str) -> bool:
-    """Whether the running interpreter can actually use the given method."""
-    if method in ("stored", "deflated"):
-        # zlib is a hard CPython dependency; stored needs nothing.
-        return True
-    if method == "bzip2":
-        return _module_importable("bz2")
-    if method == "lzma":
-        return _module_importable("lzma")
-    if method == "zstd":
-        return ZSTD is not None and _module_importable("compression.zstd")
-    return False  # pragma: no cover -- method is always one of COMPRESSION_CHOICES
-
-
-def _module_importable(name: str) -> bool:
-    try:
-        importlib.import_module(name)
-    except ImportError:
-        return False
-    return True
-
-
-def level_error(method: str, level: int | None) -> str | None:
-    """Return a human message if (method, level) is invalid, else None."""
-    if level is None:
-        return None
-    bounds = LEVEL_BOUNDS[method]
-    if bounds is None:
-        return f"--zip-compression-level has no effect for '{method}'"
-    low, high = bounds
-    if not (low <= level <= high):
-        return (
-            f"--zip-compression-level for '{method}' must be between {low} and {high}"
-        )
-    return None
-
-
-def compress_type_readable(compress_type: int) -> bool:
-    """Whether this interpreter can decompress an entry of the given type."""
-    method = _COMPRESS_TYPE_TO_METHOD.get(compress_type)
-    if method is None:
-        return False
-    return compression_available(method)
-
-
-def unreadable_method_names(compress_types: set[int]) -> set[str]:
-    """Map a set of compress_type ids to human method names for error messages."""
-    names: set[str] = set()
-    for ct in compress_types:
-        names.add(_COMPRESS_TYPE_TO_METHOD.get(ct, f"method {ct}"))
-    return names
@@ -243,21 +243,11 @@ class ZipExportSink(ExportSink):
    added as an entry at finalize (a zip entry cannot be interleaved with others).
    """

-    def __init__(
-        self,
-        target: Path,
-        zip_name: str,
-        *,
-        delete: bool = False,
-        compression: int = zipfile.ZIP_DEFLATED,
-        compresslevel: int | None = None,
-    ) -> None:
+    def __init__(self, target: Path, zip_name: str, *, delete: bool = False) -> None:
        self._target = target.resolve()
        self._zip_path = (self._target / zip_name).with_suffix(".zip")
        self._tmp_path = self._zip_path.with_name(self._zip_path.name + ".tmp")
        self._delete = delete
-        self._compression = compression
-        self._compresslevel = compresslevel
        self._zip: zipfile.ZipFile | None = None
        self._dirs: set[str] = set()
        self._pending_manifest: tuple[Path, str] | None = None
@@ -268,8 +258,7 @@ class ZipExportSink(ExportSink):
        self._zip = zipfile.ZipFile(
            self._tmp_path,
            "w",
-            compression=self._compression,
-            compresslevel=self._compresslevel,
+            compression=zipfile.ZIP_DEFLATED,
            allowZip64=True,
        )

@@ -1047,12 +1047,6 @@ class PermittedObjectsFilter(BaseFilterBackend):
    perm_codename: str | None = None

    def filter_queryset(self, request, queryset, view):
-        # Before the superuser and owner-only paths, neither of which consults
-        # permitted_object_ids. Scoped to authenticated users so anonymous
-        # access (AnonymousUser.is_active is False) keeps its existing
-        # unowned-only behaviour.
-        if request.user.is_authenticated and not request.user.is_active:
-            return queryset.none()
        if request.user.is_superuser:
            return queryset
        if not self.include_granted:
@@ -29,11 +29,6 @@ if TYPE_CHECKING:
 if settings.AUDIT_LOG_ENABLED:
    from auditlog.models import LogEntry

-from documents.export.compression import COMPRESSION_CHOICES
-from documents.export.compression import COMPRESSION_METHODS
-from documents.export.compression import ZSTD
-from documents.export.compression import compression_available
-from documents.export.compression import level_error
 from documents.export.sinks import DirectoryExportSink
 from documents.export.sinks import ExportSink
 from documents.export.sinks import StreamingManifestWriter
@@ -197,28 +192,6 @@ class Command(CryptMixin, PaperlessCommand):
            help="Sets the export zip file name",
        )

-        parser.add_argument(
-            "--zip-compression",
-            choices=COMPRESSION_CHOICES,
-            default=None,
-            help=(
-                "Compression method for the export zip (requires --zip). "
-                "Default: deflated. 'zstd' requires Python 3.14+ on both the "
-                "exporting and importing machine."
-            ),
-        )
-
-        parser.add_argument(
-            "--zip-compression-level",
-            type=int,
-            default=None,
-            help=(
-                "Compression level for the export zip (requires --zip). "
-                "deflated: 0-9, bzip2: 1-9, zstd: -22..22; ignored for "
-                "stored/lzma."
-            ),
-        )
-
        parser.add_argument(
            "--data-only",
            default=False,
@@ -274,39 +247,12 @@ class Command(CryptMixin, PaperlessCommand):
        if not os.access(self.target, os.W_OK):
            raise CommandError("That path doesn't appear to be writable")

-        zip_compression: str | None = options["zip_compression"]
-        zip_compression_level: int | None = options["zip_compression_level"]
-
-        if not self.zip_export and (
-            zip_compression is not None or zip_compression_level is not None
-        ):
-            raise CommandError(
-                "--zip-compression and --zip-compression-level require --zip",
-            )
-
-        compression_method = zip_compression or "deflated"
-        if self.zip_export:
-            if not compression_available(compression_method):
-                if compression_method == "zstd" and ZSTD is None:
-                    raise CommandError(
-                        "zstd compression requires Python 3.14 or newer",
-                    )
-                raise CommandError(
-                    f"Compression method '{compression_method}' is not "
-                    f"available on this Python runtime",
-                )
-            level_msg = level_error(compression_method, zip_compression_level)
-            if level_msg is not None:
-                raise CommandError(level_msg)
-
        sink: ExportSink
        if self.zip_export:
            sink = ZipExportSink(
                self.target,
                options["zip_name"],
                delete=self.delete,
-                compression=COMPRESSION_METHODS[compression_method],
-                compresslevel=zip_compression_level,
            )
        else:
            sink = DirectoryExportSink(
@@ -55,7 +55,7 @@ class Command(PaperlessCommand):
            "--ratio",
            default=85.0,
            type=float,
-            help="Ratio to consider documents a match (0.0 - 100.0)",
+            help="Ratio to consider documents a match",
        )
        parser.add_argument(
            "--delete",
@@ -69,17 +69,6 @@ class Command(PaperlessCommand):
            action="store_true",
            help="Skip the confirmation prompt when used with --delete",
        )
-        parser.add_argument(
-            "--url",
-            default=None,
-            type=str,
-            help=(
-                "Base URL of the Paperless instance (e.g. "
-                "http://localhost:8000 or https://paperless.local). If set, matched "
-                "documents are shown as clickable (usually ctrl+click) links to "
-                "<url>/documents/<id>/details instead of by title."
-            ),
-        )

    def _render_results(
        self,
@@ -87,7 +76,6 @@ class Command(PaperlessCommand):
        *,
        opt_ratio: float,
        do_delete: bool,
-        base_url: str | None = None,
    ) -> list[int]:
        """Render match results as a Rich table. Returns list of PKs to delete."""
        if not matches:
@@ -100,22 +88,13 @@ class Command(PaperlessCommand):
            )
            return []

-        # Fetch titles for matched documents in a single query, unless we're
-        # going to show URLs instead.
-        titles: dict[int, str] = {}
-        if not base_url:
-            all_pks = {pk for m in matches for pk in (m.doc_one_pk, m.doc_two_pk)}
-            titles = dict(
-                Document.objects.filter(pk__in=all_pks)
-                .only("pk", "title")
-                .values_list("pk", "title"),
-            )
-
-        def _cell(pk: int) -> str:
-            if base_url:
-                doc_url = f"{base_url.rstrip('/')}/documents/{pk}/details"
-                return f"[link={doc_url}]{doc_url}[/link]"
-            return f"[dim]#{pk}[/dim] {titles.get(pk, 'Unknown')}"
+        # Fetch titles for matched documents in a single query.
+        all_pks = {pk for m in matches for pk in (m.doc_one_pk, m.doc_two_pk)}
+        titles: dict[int, str] = dict(
+            Document.objects.filter(pk__in=all_pks)
+            .only("pk", "title")
+            .values_list("pk", "title"),
+        )

        table = Table(
            title=f"Fuzzy Matches (threshold: {opt_ratio:.1f}%)",
@@ -145,8 +124,8 @@ class Command(PaperlessCommand):

            table.add_row(
                str(i),
-                _cell(pk_a),
-                _cell(pk_b),
+                f"[dim]#{pk_a}[/dim] {titles.get(pk_a, 'Unknown')}",
+                f"[dim]#{pk_b}[/dim] {titles.get(pk_b, 'Unknown')}",
                Text(f"{ratio:.1f}%", style=ratio_style),
            )
            maybe_delete_ids.append(pk_b)
@@ -229,7 +208,6 @@ class Command(PaperlessCommand):
            matches,
            opt_ratio=opt_ratio,
            do_delete=options["delete"],
-            base_url=options["url"],
        )

        if options["delete"] and maybe_delete_ids:
@@ -32,8 +32,6 @@ from django.db.models.signals import post_save
 from filelock import FileLock
 from guardian.shortcuts import clear_ct_cache

-from documents.export.compression import compress_type_readable
-from documents.export.compression import unreadable_method_names
 from documents.file_handling import create_source_path_directory
 from documents.management.commands.base import PaperlessCommand
 from documents.management.commands.mixins import CryptMixin
@@ -462,20 +460,6 @@ class Command(CryptMixin, PaperlessCommand):
        with tempfile.TemporaryDirectory() as tmp_dir:
            if is_zipfile(self.source):
                with ZipFile(self.source) as zf:
-                    unsupported = {
-                        info.compress_type
-                        for info in zf.infolist()
-                        if not compress_type_readable(info.compress_type)
-                    }
-                    if unsupported:
-                        names = sorted(unreadable_method_names(unsupported))
-                        message = (
-                            f"This archive uses compression this Python version cannot "
-                            f"read ({', '.join(names)})."
-                        )
-                        if "zstd" in names:
-                            message += " zstd archives require Python 3.14+."
-                        raise CommandError(message)
                    zf.extractall(tmp_dir)
                self.source = Path(tmp_dir)
            self._run_import()
@@ -1,79 +0,0 @@
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("documents", "0022_add_perf_indexes"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="savedview",
-            name="icon",
-            field=models.CharField(
-                choices=[
-                    ("archive", "Archive"),
-                    ("bank", "Bank"),
-                    ("basket", "Basket"),
-                    ("bell", "Bell"),
-                    ("bookmark", "Bookmark"),
-                    ("boxes", "Boxes"),
-                    ("briefcase", "Briefcase"),
-                    ("building", "Building"),
-                    ("calculator", "Calculator"),
-                    ("calendar", "Calendar"),
-                    ("camera", "Camera"),
-                    ("card-checklist", "Checklist"),
-                    ("cash", "Cash"),
-                    ("chat-left-text", "Chat"),
-                    ("check-circle", "Check"),
-                    ("clipboard", "Clipboard"),
-                    ("clock-history", "Clock"),
-                    ("credit-card", "Credit card"),
-                    ("download", "Download"),
-                    ("envelope", "Envelope"),
-                    ("exclamation-triangle", "Warning"),
-                    ("file-earmark", "File"),
-                    ("file-earmark-check", "Checked file"),
-                    ("file-earmark-lock", "Locked file"),
-                    ("file-earmark-medical", "Medical file"),
-                    ("file-earmark-person", "Person file"),
-                    ("file-earmark-spreadsheet", "Spreadsheet"),
-                    ("file-text", "Text file"),
-                    ("files", "Files"),
-                    ("folder", "Folder"),
-                    ("funnel", "Filter"),
-                    ("gear", "Gear"),
-                    ("globe2", "Globe"),
-                    ("hash", "Hash"),
-                    ("heart", "Heart"),
-                    ("house", "House"),
-                    ("inbox", "Inbox"),
-                    ("journals", "Journals"),
-                    ("list-task", "Task list"),
-                    ("newspaper", "Newspaper"),
-                    ("paperclip", "Attachment"),
-                    ("people", "People"),
-                    ("person", "Person"),
-                    ("printer", "Printer"),
-                    ("receipt", "Receipt"),
-                    ("safe", "Safe"),
-                    ("search", "Search"),
-                    ("send", "Send"),
-                    ("shop", "Shop"),
-                    ("stack", "Stack"),
-                    ("stars", "Stars"),
-                    ("tag", "Tag"),
-                    ("tags", "Tags"),
-                    ("telephone", "Telephone"),
-                    ("truck", "Truck"),
-                    ("upc-scan", "Barcode"),
-                    ("wallet2", "Wallet"),
-                ],
-                default="funnel",
-                max_length=64,
-                verbose_name="icon",
-            ),
-        ),
-    ]
@@ -519,68 +519,6 @@ class Document(SoftDeleteModel, ModelWithOwner):  # type: ignore[django-manager-


 class SavedView(ModelWithOwner):
-    class Icon(models.TextChoices):
-        ARCHIVE = ("archive", _("Archive"))
-        BANK = ("bank", _("Bank"))
-        BASKET = ("basket", _("Basket"))
-        BELL = ("bell", _("Bell"))
-        BOOKMARK = ("bookmark", _("Bookmark"))
-        BOXES = ("boxes", _("Boxes"))
-        BRIEFCASE = ("briefcase", _("Briefcase"))
-        BUILDING = ("building", _("Building"))
-        CALCULATOR = ("calculator", _("Calculator"))
-        CALENDAR = ("calendar", _("Calendar"))
-        CAMERA = ("camera", _("Camera"))
-        CARD_CHECKLIST = ("card-checklist", _("Checklist"))
-        CASH = ("cash", _("Cash"))
-        CHAT_LEFT_TEXT = ("chat-left-text", _("Chat"))
-        CHECK_CIRCLE = ("check-circle", _("Check"))
-        CLIPBOARD = ("clipboard", _("Clipboard"))
-        CLOCK_HISTORY = ("clock-history", _("Clock"))
-        CREDIT_CARD = ("credit-card", _("Credit card"))
-        DOWNLOAD = ("download", _("Download"))
-        ENVELOPE = ("envelope", _("Envelope"))
-        EXCLAMATION_TRIANGLE = ("exclamation-triangle", _("Warning"))
-        FILE_EARMARK = ("file-earmark", _("File"))
-        FILE_EARMARK_CHECK = ("file-earmark-check", _("Checked file"))
-        FILE_EARMARK_LOCK = ("file-earmark-lock", _("Locked file"))
-        FILE_EARMARK_MEDICAL = ("file-earmark-medical", _("Medical file"))
-        FILE_EARMARK_PERSON = ("file-earmark-person", _("Person file"))
-        FILE_EARMARK_SPREADSHEET = (
-            "file-earmark-spreadsheet",
-            _("Spreadsheet"),
-        )
-        FILE_TEXT = ("file-text", _("Text file"))
-        FILES = ("files", _("Files"))
-        FOLDER = ("folder", _("Folder"))
-        FUNNEL = ("funnel", _("Filter"))
-        GEAR = ("gear", _("Gear"))
-        GLOBE = ("globe2", _("Globe"))
-        HASH = ("hash", _("Hash"))
-        HEART = ("heart", _("Heart"))
-        HOUSE = ("house", _("House"))
-        INBOX = ("inbox", _("Inbox"))
-        JOURNALS = ("journals", _("Journals"))
-        LIST_TASK = ("list-task", _("Task list"))
-        NEWSPAPER = ("newspaper", _("Newspaper"))
-        PAPERCLIP = ("paperclip", _("Attachment"))
-        PEOPLE = ("people", _("People"))
-        PERSON = ("person", _("Person"))
-        PRINTER = ("printer", _("Printer"))
-        RECEIPT = ("receipt", _("Receipt"))
-        SAFE = ("safe", _("Safe"))
-        SEARCH = ("search", _("Search"))
-        SEND = ("send", _("Send"))
-        SHOP = ("shop", _("Shop"))
-        STACK = ("stack", _("Stack"))
-        STARS = ("stars", _("Stars"))
-        TAG = ("tag", _("Tag"))
-        TAGS = ("tags", _("Tags"))
-        TELEPHONE = ("telephone", _("Telephone"))
-        TRUCK = ("truck", _("Truck"))
-        UPC_SCAN = ("upc-scan", _("Barcode"))
-        WALLET = ("wallet2", _("Wallet"))
-
    class DisplayMode(models.TextChoices):
        TABLE = ("table", _("Table"))
        SMALL_CARDS = ("smallCards", _("Small Cards"))
@@ -603,13 +541,6 @@ class SavedView(ModelWithOwner):

    name = models.CharField(_("name"), max_length=128)

-    icon = models.CharField(
-        _("icon"),
-        max_length=64,
-        choices=Icon.choices,
-        default=Icon.FUNNEL,
-    )
-
    sort_field = models.CharField(
        _("sort field"),
        max_length=128,
@@ -1,5 +1,4 @@
 from typing import Any
-from typing import TypeVar

 from django.contrib.auth.models import Group
 from django.contrib.auth.models import Permission
@@ -55,15 +54,11 @@ class PaperlessObjectPermissions(DjangoObjectPermissions):

 class PaperlessAdminPermissions(BasePermission):
    def has_permission(self, request, view):
-        return request.user.is_active and request.user.is_staff
+        return request.user.is_staff


 def has_global_statistics_permission(user: User | None) -> bool:
-    if (
-        user is None
-        or not getattr(user, "is_active", False)
-        or not getattr(user, "is_authenticated", False)
-    ):
+    if user is None or not getattr(user, "is_authenticated", False):
        return False

    return getattr(user, "is_superuser", False) or user.has_perm(
@@ -72,11 +67,7 @@ def has_global_statistics_permission(user: User | None) -> bool:


 def has_system_status_permission(user: User | None) -> bool:
-    if (
-        user is None
-        or not getattr(user, "is_active", False)
-        or not getattr(user, "is_authenticated", False)
-    ):
+    if user is None or not getattr(user, "is_authenticated", False):
        return False

    return (
@@ -197,13 +188,6 @@ def permitted_object_ids(
    if user is None or not getattr(user, "is_authenticated", False):
        return base_qs.filter(owner__isnull=True).values_list("id", flat=True)

-    # Deactivated users get nothing, deactivated superusers included, so this
-    # has to come before the superuser shortcut. guardian's
-    # ObjectPermissionChecker denies inactive users, but get_objects_for_user
-    # (the pattern this replaces) does not, so it would not be inherited.
-    if not getattr(user, "is_active", False):
-        return base_qs.none().values_list("id", flat=True)
-
    if getattr(user, "is_superuser", False):
        return base_qs.values_list("id", flat=True)

@@ -236,58 +220,6 @@ def permitted_object_ids(
    ).values_list("id", flat=True)


-ModelT = TypeVar("ModelT", bound=Model)
-
-
-def user_is_unrestricted(user: User | None) -> bool:
-    """
-    True when ``user`` means "no restriction at all" (an absent user, or an
-    *active* superuser) without needing a database check to know it.
-
-    ``permitted_object_ids(None, ...)`` itself means the much narrower "only
-    unowned rows", which is NOT the same thing as "no user filtering
-    requested", so callers must special-case this before ever calling it.
-    A deactivated superuser is deliberately NOT unrestricted here, matching
-    permitted_object_ids's own is_active-before-is_superuser ordering.
-
-    Callers that can avoid a database round trip entirely when this is true
-    (e.g. checking a single already-loaded object's visibility rather than
-    filtering a queryset) should do so via this function directly, rather
-    than through restrict_queryset_to_visible() below.
-    """
-    if user is None:
-        return True
-    return (
-        getattr(user, "is_authenticated", False)
-        and getattr(user, "is_active", False)
-        and getattr(user, "is_superuser", False)
-    )
-
-
-def restrict_queryset_to_visible(
-    queryset: QuerySet[ModelT],
-    user: User | None,
-    perm: str,
-) -> QuerySet[ModelT]:
-    """
-    Restrict ``queryset`` to the rows ``user`` may see with ``perm``.
-
-    Delegates the visibility check to the database as a
-    ``WHERE id IN (subquery)`` rather than materializing the full
-    permitted-id set into a Python collection first: a caller that only
-    needs to check a small handful of rows (a resolved-id list, a few
-    RAG-neighbour candidate ids) never pays for scanning or holding the
-    installation's entire taxonomy in memory to do it.
-
-    Returns ``queryset`` unchanged for user_is_unrestricted(user); every
-    other case is delegated to ``permitted_object_ids`` rather than
-    re-deciding the ordering here.
-    """
-    if user_is_unrestricted(user):
-        return queryset
-    return queryset.filter(pk__in=permitted_object_ids(user, queryset.model, perm))
-
-
 def permitted_document_ids(
    user: User | None,
    *,
@@ -223,27 +223,7 @@ class WriteBatch:
                    )
                    time.sleep(sleep_s)

-            # Open a fresh Index (and thus a fresh Tantivy ManagedDirectory)
-            # for the write, rather than reusing the process-local cached
-            # index. ManagedDirectory loads its GC bookkeeping (.managed.json)
-            # once, at construction, and never re-reads it; paperless runs
-            # several long-lived processes (Granian workers, Celery workers)
-            # that take turns writing under the file lock above. A cached,
-            # long-lived writer index would carry a stale managed-files view
-            # and, on commit, overwrite .managed.json with that stale view -
-            # permanently losing track of segment files other processes
-            # registered in the meantime, so they can never be garbage
-            # collected. Reopening fresh here always picks up the current
-            # on-disk state. The long-lived self._backend._index is used for
-            # reads only and is reloaded (not reopened) after commit below.
-            write_index = tantivy.Index(
-                build_schema(),
-                path=str(self._backend._path),
-            )
-            register_tokenizers(write_index, settings.SEARCH_LANGUAGE)
-            self._raw_writer = write_index.writer()
-        else:
-            self._raw_writer = self._backend._index.writer()
+        self._raw_writer = self._backend._index.writer()
        return self

    def __exit__(self, exc_type, exc_val, exc_tb):
@@ -85,7 +85,6 @@ from documents.permissions import set_permissions_for_object
 from documents.regex import validate_regex_pattern
 from documents.templating.filepath import validate_filepath_template_and_render
 from documents.templating.utils import convert_format_str_to_template_format
-from documents.templating.workflows import validate_workflow_template
 from documents.validators import uri_validator
 from documents.validators import url_validator

@@ -1384,7 +1383,6 @@ class SavedViewSerializer(OwnedObjectSerializer):
        fields = [
            "id",
            "name",
-            "icon",
            "sort_field",
            "sort_reverse",
            "filter_rules",
@@ -3186,19 +3184,35 @@ class WorkflowActionSerializer(serializers.ModelSerializer[WorkflowAction]):
                attrs["assign_title"] = None
            else:
                try:
-                    validate_workflow_template(attrs["assign_title"])
+                    # test against all placeholders, see consumer.py `parse_doc_title_w_placeholders`
+                    attrs["assign_title"].format(
+                        correspondent="",
+                        document_type="",
+                        added="",
+                        added_year="",
+                        added_year_short="",
+                        added_month="",
+                        added_month_name="",
+                        added_month_name_short="",
+                        added_day="",
+                        added_time="",
+                        owner_username="",
+                        original_filename="",
+                        filename="",
+                        created="",
+                        created_year="",
+                        created_year_short="",
+                        created_month="",
+                        created_month_name="",
+                        created_month_name_short="",
+                        created_day="",
+                        created_time="",
+                    )
                except (ValueError, KeyError) as e:
                    raise serializers.ValidationError(
-                        {"assign_title": f"{e.args[0]}"},
+                        {"assign_title": f'Invalid f-string detected: "{e.args[0]}"'},
                    )

-        if attrs.get("assign_custom_fields_values"):
-            # Empty strings treated as None to avoid unexpected behavior
-            attrs["assign_custom_fields_values"] = {
-                field_id: (None if value == "" else value)
-                for field_id, value in attrs["assign_custom_fields_values"].items()
-            }
-
        if (
            "type" in attrs
            and attrs["type"] == WorkflowAction.WorkflowActionType.EMAIL
@@ -6,11 +6,9 @@ from pathlib import Path
 from django.utils.text import slugify as django_slugify
 from jinja2 import StrictUndefined
 from jinja2 import Template
-from jinja2 import TemplateAssertionError
 from jinja2 import TemplateSyntaxError
 from jinja2 import UndefinedError
 from jinja2 import make_logging_undefined
-from jinja2.meta import find_undeclared_variables
 from jinja2.sandbox import SecurityError

 from documents.templating.environment import _template_environment
@@ -31,49 +29,6 @@ _template_environment.filters["slugify"] = django_slugify
 _template_environment.filters["localize_date"] = localize_date


-_known_placeholder_names = {
-    "correspondent",
-    "document_type",
-    "added",
-    "added_year",
-    "added_year_short",
-    "added_month",
-    "added_month_name",
-    "added_month_name_short",
-    "added_day",
-    "added_time",
-    "owner_username",
-    "original_filename",
-    "filename",
-    "created",
-    "created_year",
-    "created_year_short",
-    "created_month",
-    "created_month_name",
-    "created_month_name_short",
-    "created_day",
-    "created_time",
-    "doc_title",
-    "doc_url",
-    "doc_id",
-}
-
-
-def validate_workflow_template(text: str) -> None:
-    try:
-        ast = _template_environment.parse(text)
-        undeclared_vars = find_undeclared_variables(ast)
-    except TemplateAssertionError as e:
-        raise ValueError(f"Template assertion error: {e}")
-    except TemplateSyntaxError as e:
-        raise ValueError(f"Template syntax error: {e}")
-    unknown_vars = undeclared_vars - _known_placeholder_names
-    if unknown_vars:
-        raise KeyError(
-            f"Template references unknown placeholders: {', '.join(unknown_vars)}",
-        )
-
-
 def parse_w_workflow_placeholders(
    text: str,
    correspondent_name: str,
@@ -1,208 +0,0 @@
-import sys
-import zipfile
-
-import pytest
-import pytest_mock
-
-from documents.export import compression
-
-
-class TestCompressionMethods:
-    def test_choices_always_include_zstd(self) -> None:
-        """
-        GIVEN:
-            - The compression policy module's CLI choices list
-        WHEN:
-            - Read on any runtime
-        THEN:
-            - zstd is always present; availability is checked separately so
-              argparse never hides it based on the current Python version
-        """
-        assert compression.COMPRESSION_CHOICES == (
-            "stored",
-            "deflated",
-            "bzip2",
-            "lzma",
-            "zstd",
-        )
-
-    @pytest.mark.parametrize(
-        ("name", "constant"),
-        [
-            ("stored", zipfile.ZIP_STORED),
-            ("deflated", zipfile.ZIP_DEFLATED),
-            ("bzip2", zipfile.ZIP_BZIP2),
-            ("lzma", zipfile.ZIP_LZMA),
-        ],
-    )
-    def test_method_maps_to_zipfile_constant(self, name: str, constant: int) -> None:
-        """
-        GIVEN:
-            - A compression method name
-        WHEN:
-            - Looked up in COMPRESSION_METHODS
-        THEN:
-            - It maps to the matching zipfile compression constant
-        """
-        assert compression.COMPRESSION_METHODS[name] == constant
-
-    def test_stored_and_deflated_always_available(self) -> None:
-        """
-        GIVEN:
-            - The stored and deflated compression methods
-        WHEN:
-            - Checked with compression_available()
-        THEN:
-            - Both are always available (zlib is a hard CPython dependency)
-        """
-        assert compression.compression_available("stored")
-        assert compression.compression_available("deflated")
-
-    def test_zstd_availability_tracks_runtime(self) -> None:
-        """
-        GIVEN:
-            - The zstd compression method
-        WHEN:
-            - Checked with compression_available() on this runtime
-        THEN:
-            - Availability matches whether Python is 3.14+
-        """
-        expected: bool = sys.version_info >= (3, 14)
-        assert compression.compression_available("zstd") == expected
-
-    def test_unimportable_module_reports_unavailable(
-        self,
-        mocker: pytest_mock.MockerFixture,
-    ) -> None:
-        """
-        GIVEN:
-            - A compression method whose backing module fails to import
-              (e.g. a minimal Python build without bz2/lzma compiled in)
-        WHEN:
-            - Checked with compression_available()
-        THEN:
-            - False is returned rather than the ImportError propagating
-        """
-        mocker.patch(
-            "documents.export.compression.importlib.import_module",
-            side_effect=ImportError,
-        )
-        assert not compression.compression_available("bzip2")
-
-
-class TestLevelError:
-    @pytest.mark.parametrize(
-        ("method", "level"),
-        [
-            ("deflated", 0),
-            ("deflated", 9),
-            ("bzip2", 1),
-            ("bzip2", 9),
-            ("zstd", -22),
-            ("zstd", 22),
-            ("deflated", None),
-            ("stored", None),
-        ],
-    )
-    def test_valid_levels_return_none(self, method: str, level: int | None) -> None:
-        """
-        GIVEN:
-            - A method and a level within its valid bounds (or no level)
-        WHEN:
-            - Checked with level_error()
-        THEN:
-            - No error message is returned
-        """
-        assert compression.level_error(method, level) is None
-
-    @pytest.mark.parametrize(
-        ("method", "level"),
-        [
-            ("deflated", 10),
-            ("deflated", -1),
-            ("bzip2", 0),
-            ("bzip2", 10),
-            ("zstd", -23),
-            ("zstd", 23),
-        ],
-    )
-    def test_out_of_range_levels_return_message(
-        self,
-        method: str,
-        level: int,
-    ) -> None:
-        """
-        GIVEN:
-            - A method and a level outside its valid bounds
-        WHEN:
-            - Checked with level_error()
-        THEN:
-            - An error message naming the valid range is returned
-        """
-        msg: str | None = compression.level_error(method, level)
-        assert msg is not None
-        assert "between" in msg
-
-    @pytest.mark.parametrize("method", ["stored", "lzma"])
-    def test_level_on_levelless_method_is_rejected(self, method: str) -> None:
-        """
-        GIVEN:
-            - A method that ignores compression level (stored, lzma)
-        WHEN:
-            - A level is passed to level_error() anyway
-        THEN:
-            - An error message noting the level has no effect is returned
-        """
-        msg: str | None = compression.level_error(method, 5)
-        assert msg is not None
-        assert "no effect" in msg
-
-
-class TestCompressTypeReadable:
-    @pytest.mark.parametrize("ct", [zipfile.ZIP_STORED, zipfile.ZIP_DEFLATED])
-    def test_stored_and_deflated_always_readable(self, ct: int) -> None:
-        """
-        GIVEN:
-            - A stored or deflated compress_type id
-        WHEN:
-            - Checked with compress_type_readable()
-        THEN:
-            - It is always readable
-        """
-        assert compression.compress_type_readable(ct)
-
-    def test_zstd_compress_type_readability_tracks_runtime(self) -> None:
-        """
-        GIVEN:
-            - The zstd compress_type id (93, ZIP_ZSTANDARD)
-        WHEN:
-            - Checked with compress_type_readable() on this runtime
-        THEN:
-            - Readability matches whether Python is 3.14+
-        """
-        expected: bool = sys.version_info >= (3, 14)
-        assert compression.compress_type_readable(93) == expected
-
-    def test_unknown_compress_type_is_unreadable(self) -> None:
-        """
-        GIVEN:
-            - An unrecognized compress_type id
-        WHEN:
-            - Checked with compress_type_readable()
-        THEN:
-            - It is reported as unreadable
-        """
-        assert not compression.compress_type_readable(9999)
-
-    def test_unreadable_method_names_lists_methods(self) -> None:
-        """
-        GIVEN:
-            - A set containing an unknown compress_type id
-        WHEN:
-            - Passed to unreadable_method_names()
-        THEN:
-            - It is reported generically as "method <id>"
-        """
-        # An unknown method id maps to no name and is reported generically.
-        names: set[str] = compression.unreadable_method_names({9999})
-        assert names == {"method 9999"}
@@ -5,7 +5,6 @@ import zipfile
 from pathlib import Path

 import pytest
-import pytest_mock
 from pytest_django.fixtures import SettingsWrapper

 from documents.export.sinks import DirectoryExportSink
@@ -306,48 +305,6 @@ class TestZipExportSink:
        assert not (target / "export.zip").exists()


-class TestZipExportSinkCompression:
-    @pytest.mark.parametrize(
-        ("method", "constant"),
-        [
-            ("stored", zipfile.ZIP_STORED),
-            ("deflated", zipfile.ZIP_DEFLATED),
-            ("bzip2", zipfile.ZIP_BZIP2),
-            ("lzma", zipfile.ZIP_LZMA),
-        ],
-    )
-    def test_compression_and_level_forwarded_to_zipfile(
-        self,
-        mocker: pytest_mock.MockerFixture,
-        tmp_path: Path,
-        method: str,
-        constant: int,
-    ) -> None:
-        """
-        GIVEN:
-            - A ZipExportSink constructed with a compression method and level
-        WHEN:
-            - The sink is opened
-        THEN:
-            - zipfile.ZipFile is constructed with those values forwarded
-              unchanged (whether ZipFile actually compresses is Python's own
-              contract, not ours, so this checks the call args, not a real
-              archive)
-        """
-        target: Path = tmp_path / "out"
-        target.mkdir()
-        zip_cls = mocker.patch("documents.export.sinks.zipfile.ZipFile")
-        sink = ZipExportSink(target, "export", compression=constant, compresslevel=5)
-        sink._open()
-        zip_cls.assert_called_once_with(
-            mocker.ANY,
-            "w",
-            compression=constant,
-            compresslevel=5,
-            allowZip64=True,
-        )
-
-
 class TestStreamContract:
    @pytest.fixture(params=["dir", "zip"])
    def sink(self, request: pytest.FixtureRequest, tmp_path: Path) -> ExportSink:
@@ -1,6 +1,3 @@
-import json
-from pathlib import Path
-
 import pytest
 from django.contrib.auth.models import Group
 from django.contrib.auth.models import User
@@ -24,17 +21,6 @@ from documents.tests.factories import UserFactory

 pytestmark = [pytest.mark.search, pytest.mark.django_db]

-# Extensions of actual Tantivy segment data files, as opposed to its own
-# bookkeeping files (meta.json, .managed.json, lock files).
-_SEGMENT_FILE_EXTENSIONS = (
-    ".fast",
-    ".fieldnorm",
-    ".idx",
-    ".pos",
-    ".store",
-    ".term",
-)
-

 class TestWriteBatch:
    """Test WriteBatch context manager functionality."""
@@ -1028,63 +1014,3 @@ class TestHighlightHits:
        hits = backend.highlight_hits("quick", [doc.pk])

        assert len(hits) == 0
-
-
-class TestIndexDirectoryGarbageCollection:
-    """Regression tests for Tantivy segment files leaking on disk when
-    multiple long-lived worker processes (Granian/Celery) take turns writing
-    to the same on-disk index (issue #13679)."""
-
-    def test_no_permanently_orphaned_segment_files_across_worker_processes(
-        self,
-        tmp_path: Path,
-    ) -> None:
-        """Simulate two long-lived worker processes, each with its own
-        process-local ``TantivyBackend``/``Index`` opened once at process
-        start, alternating turns as the writer -- exactly how paperless runs
-        in production (several Granian + Celery worker processes).
-
-        Every segment file physically present on disk must still be tracked
-        in Tantivy's ``.managed.json`` bookkeeping; otherwise it can never be
-        garbage collected by anyone again and the index directory grows
-        without bound.
-        """
-        index_dir = tmp_path / "index"
-        index_dir.mkdir()
-
-        worker_a = TantivyBackend(path=index_dir)
-        worker_a.open()
-        worker_b = TantivyBackend(path=index_dir)
-        worker_b.open()
-        workers = [worker_a, worker_b]
-
-        docs = [
-            DocumentFactory.create(checksum=f"GC{i}", title=f"gc doc {i}")
-            for i in range(5)
-        ]
-
-        try:
-            # Alternate writers across many commits, repeatedly upserting the
-            # same documents so segments accumulate and get superseded,
-            # forcing the delete+add upsert pattern and eventual merges.
-            for i in range(30):
-                worker = workers[i % len(workers)]
-                doc = docs[i % len(docs)]
-                worker.add_or_update(doc)
-        finally:
-            worker_a.close()
-            worker_b.close()
-
-        managed_path = index_dir / ".managed.json"
-        managed = set(json.loads(managed_path.read_text()))
-        on_disk = {
-            p.name
-            for p in index_dir.iterdir()
-            if p.is_file() and p.suffix in _SEGMENT_FILE_EXTENSIONS
-        }
-        orphans = on_disk - managed
-
-        assert not orphans, (
-            "Segment files present on disk but absent from Tantivy's "
-            f".managed.json bookkeeping (permanently un-collectible): {orphans}"
-        )
@@ -2905,20 +2905,18 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):

        v1 = SavedView.objects.get(name="test")
        self.assertEqual(v1.sort_field, "created2")
-        self.assertEqual(v1.icon, SavedView.Icon.FUNNEL)
        self.assertEqual(v1.filter_rules.count(), 1)
        self.assertEqual(v1.owner, self.user)

        response = self.client.patch(
            f"/api/saved_views/{v1.id}/",
-            {"sort_reverse": True, "icon": SavedView.Icon.RECEIPT},
+            {"sort_reverse": True},
            format="json",
        )

        v1 = SavedView.objects.get(id=v1.id)
        self.assertEqual(response.status_code, status.HTTP_200_OK)
        self.assertTrue(v1.sort_reverse)
-        self.assertEqual(v1.icon, SavedView.Icon.RECEIPT)
        self.assertEqual(v1.filter_rules.count(), 1)

        view["filter_rules"] = [{"rule_type": 12, "value": "secret"}]
@@ -2938,13 +2936,6 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
        v1 = SavedView.objects.get(id=v1.id)
        self.assertEqual(v1.filter_rules.count(), 0)

-        response = self.client.patch(
-            f"/api/saved_views/{v1.id}/",
-            {"icon": "not-an-icon"},
-            format="json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-
    def test_saved_view_display_options(self) -> None:
        """
        GIVEN:
@@ -351,45 +351,11 @@ class TestApiWorkflows(DirectoriesMixin, APITestCase):

        self.assertEqual(WorkflowTrigger.objects.count(), 1)

-    def test_api_create_complex_assign_title(self) -> None:
+    def test_api_create_invalid_assign_title(self) -> None:
        """
        GIVEN:
            - API request to create a workflow
-            - Template using Jinja flow control statements
-        WHEN:
-            - API is called
-        THEN:
-            - Workflow is created
-        """
-        response = self.client.post(
-            self.ENDPOINT,
-            json.dumps(
-                {
-                    "name": "Workflow 2",
-                    "order": 1,
-                    "triggers": [
-                        {
-                            "type": WorkflowTrigger.WorkflowTriggerType.DOCUMENT_UPDATED,
-                        },
-                    ],
-                    "actions": [
-                        {
-                            "assign_title": '{# this is a comment #}foo{% if created_year < 2000 %}bar{% endif %}{{ "{:04d}".format(42) }}',
-                        },
-                    ],
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
-
-        self.assertEqual(Workflow.objects.count(), 2)
-
-    def test_api_create_invalid_assign_title_syntax_error(self) -> None:
-        """
-        GIVEN:
-            - API request to create a workflow
-            - Invalid template for assign_title
+            - Invalid f-string for assign_title
        WHEN:
            - API is called
        THEN:
@@ -400,7 +366,7 @@ class TestApiWorkflows(DirectoriesMixin, APITestCase):
            self.ENDPOINT,
            json.dumps(
                {
-                    "name": "Workflow 2",
+                    "name": "Workflow 1",
                    "order": 1,
                    "triggers": [
                        {
@@ -409,7 +375,7 @@ class TestApiWorkflows(DirectoriesMixin, APITestCase):
                    ],
                    "actions": [
                        {
-                            "assign_title": "{{created_year}",
+                            "assign_title": "{created_year]",
                        },
                    ],
                },
@@ -418,89 +384,7 @@ class TestApiWorkflows(DirectoriesMixin, APITestCase):
        )
        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
        self.assertIn(
-            "Template syntax error",
-            response.data["actions"][0]["assign_title"][0],
-        )
-
-        self.assertEqual(Workflow.objects.count(), 1)
-
-    def test_api_create_invalid_assign_title_assertion_error(self) -> None:
-        """
-        GIVEN:
-            - API request to create a workflow
-            - Template using unknown filters for assign_title
-        WHEN:
-            - API is called
-        THEN:
-            - Correct HTTP 400 response
-            - No objects are created
-        """
-        response = self.client.post(
-            self.ENDPOINT,
-            json.dumps(
-                {
-                    "name": "Workflow 2",
-                    "order": 1,
-                    "triggers": [
-                        {
-                            "type": WorkflowTrigger.WorkflowTriggerType.DOCUMENT_UPDATED,
-                        },
-                    ],
-                    "actions": [
-                        {
-                            "assign_title": "{{ created_year | foo }}",
-                        },
-                    ],
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        self.assertIn(
-            "Template assertion error",
-            response.data["actions"][0]["assign_title"][0],
-        )
-
-        self.assertEqual(Workflow.objects.count(), 1)
-
-    def test_api_create_invalid_assign_title_unknown_placeholder(self) -> None:
-        """
-        GIVEN:
-            - API request to create a workflow
-            - Template with unknown placeholders for assign_title
-        WHEN:
-            - API is called
-        THEN:
-            - Correct HTTP 400 response
-            - No objects are created
-        """
-        response = self.client.post(
-            self.ENDPOINT,
-            json.dumps(
-                {
-                    "name": "Workflow 2",
-                    "order": 1,
-                    "triggers": [
-                        {
-                            "type": WorkflowTrigger.WorkflowTriggerType.DOCUMENT_UPDATED,
-                        },
-                    ],
-                    "actions": [
-                        {
-                            "assign_title": "{{creation_year}}",
-                        },
-                    ],
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        self.assertIn(
-            "Template references unknown placeholders",
-            response.data["actions"][0]["assign_title"][0],
-        )
-        self.assertIn(
-            "creation_year",
+            "Invalid f-string detected",
            response.data["actions"][0]["assign_title"][0],
        )

@@ -538,11 +422,6 @@ class TestApiWorkflows(DirectoriesMixin, APITestCase):
            json.dumps(
                {
                    "assign_title": "",
-                    "assign_custom_fields": [self.cf1.id, self.cf2.id],
-                    "assign_custom_fields_values": {
-                        str(self.cf1.id): "",
-                        str(self.cf2.id): 0,
-                    },
                },
            ),
            content_type="application/json",
@@ -550,10 +429,6 @@ class TestApiWorkflows(DirectoriesMixin, APITestCase):
        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
        action = WorkflowAction.objects.get(id=response.data["id"])
        self.assertIsNone(action.assign_title)
-        self.assertEqual(
-            action.assign_custom_fields_values,
-            {str(self.cf1.id): None, str(self.cf2.id): 0},
-        )

        response = self.client.post(
            self.ENDPOINT_TRIGGERS,
@@ -6,8 +6,6 @@ from datetime import timedelta
 from io import StringIO
 from pathlib import Path
 from unittest import mock
-from zipfile import ZIP_DEFLATED
-from zipfile import ZIP_LZMA
 from zipfile import ZipFile

 import pytest
@@ -1080,197 +1078,6 @@ class TestExportImport(
                        skip_checks=True,
                    )

-    def test_compression_flags_require_zip(self) -> None:
-        """
-        GIVEN:
-            - A request to export without --zip
-        WHEN:
-            - --zip-compression or --zip-compression-level is passed anyway
-        THEN:
-            - A CommandError is raised (the flags are meaningless without --zip)
-        """
-        cases = {
-            "zip-compression": ["--zip-compression", "lzma"],
-            "zip-compression-level": ["--zip-compression-level", "5"],
-        }
-        for case_id, args in cases.items():
-            with self.subTest(case_id), self.assertRaises(CommandError):
-                call_command(
-                    "document_exporter",
-                    self.target,
-                    *args,
-                    skip_checks=True,
-                )
-
-    def test_zip_compression_level_out_of_range_raises(self) -> None:
-        """
-        GIVEN:
-            - A request to export to a zip file
-        WHEN:
-            - --zip-compression-level is outside the chosen method's valid range
-        THEN:
-            - A CommandError is raised
-        """
-        with self.assertRaises(CommandError):
-            call_command(
-                "document_exporter",
-                self.target,
-                "--zip",
-                "--zip-compression",
-                "deflated",
-                "--zip-compression-level",
-                "99",
-                skip_checks=True,
-            )
-
-    def test_zip_compression_level_rejected_for_levelless_method(self) -> None:
-        """
-        GIVEN:
-            - A request to export to a zip file with a compression method
-              that ignores level entirely (stored, lzma)
-        WHEN:
-            - --zip-compression-level is also passed
-        THEN:
-            - A CommandError is raised
-        """
-        for method in ("stored", "lzma"):
-            with self.subTest(method), self.assertRaises(CommandError):
-                call_command(
-                    "document_exporter",
-                    self.target,
-                    "--zip",
-                    "--zip-compression",
-                    method,
-                    "--zip-compression-level",
-                    "5",
-                    skip_checks=True,
-                )
-
-    def test_zstd_unavailable_raises_friendly_error(self) -> None:
-        """
-        GIVEN:
-            - A Python runtime without zstd support (< 3.14)
-        WHEN:
-            - --zip-compression zstd is requested
-        THEN:
-            - A CommandError naming the Python version requirement is raised
-
-        zstd availability is mocked rather than relying on the actual
-        runtime: on a Python 3.14+ CI leg, ZSTD is not None, so without the
-        mock this check is skipped and the command falls through into the
-        real export, which fails on missing document files instead of
-        raising the expected CommandError.
-        """
-        with (
-            mock.patch(
-                "documents.management.commands.document_exporter.ZSTD",
-                None,
-            ),
-            mock.patch(
-                "documents.management.commands.document_exporter.compression_available",
-                return_value=False,
-            ),
-            self.assertRaises(CommandError) as e,
-        ):
-            call_command(
-                "document_exporter",
-                self.target,
-                "--zip",
-                "--zip-compression",
-                "zstd",
-                skip_checks=True,
-            )
-        self.assertIn("3.14", str(e.exception))
-
-    def test_non_zstd_unavailable_raises_generic_error(self) -> None:
-        """
-        GIVEN:
-            - A Python runtime missing the module backing a non-zstd method
-              (e.g. bz2/lzma not compiled in on a minimal build)
-        WHEN:
-            - That method is requested via --zip-compression
-        THEN:
-            - A CommandError is raised naming the method, not the
-              zstd-specific "requires 3.14" message
-        """
-        with (
-            mock.patch(
-                "documents.management.commands.document_exporter.compression_available",
-                return_value=False,
-            ),
-            self.assertRaises(CommandError) as e,
-        ):
-            call_command(
-                "document_exporter",
-                self.target,
-                "--zip",
-                "--zip-compression",
-                "bzip2",
-                skip_checks=True,
-            )
-        self.assertIn("bzip2", str(e.exception))
-        self.assertNotIn("3.14", str(e.exception))
-
-    def test_zip_compression_flag_resolves_to_sink_constant(self) -> None:
-        """
-        GIVEN:
-            - A request to export to a zip file with --zip-compression lzma
-        WHEN:
-            - The export runs
-        THEN:
-            - ZipExportSink is constructed with the resolved ZIP_LZMA constant
-              (whether zipfile actually compresses with the chosen method is
-              Python's own contract, and ZipExportSink's own tests already
-              cover the forwarding; what this command owns is resolving the
-              CLI string to the right constant, so assert that resolution
-              directly)
-        """
-        with mock.patch(
-            "documents.management.commands.document_exporter.ZipExportSink",
-        ) as sink_cls:
-            call_command(
-                "document_exporter",
-                self.target,
-                "--zip",
-                "--zip-compression",
-                "lzma",
-                skip_checks=True,
-            )
-        sink_cls.assert_called_once_with(
-            mock.ANY,
-            mock.ANY,
-            delete=False,
-            compression=ZIP_LZMA,
-            compresslevel=None,
-        )
-
-    def test_default_zip_compression_resolves_to_deflate(self) -> None:
-        """
-        GIVEN:
-            - A request to export to a zip file with no --zip-compression flag
-        WHEN:
-            - The export runs
-        THEN:
-            - ZipExportSink is constructed with the default ZIP_DEFLATED
-              constant and compresslevel=None, matching pre-existing behavior
-        """
-        with mock.patch(
-            "documents.management.commands.document_exporter.ZipExportSink",
-        ) as sink_cls:
-            call_command(
-                "document_exporter",
-                self.target,
-                "--zip",
-                skip_checks=True,
-            )
-        sink_cls.assert_called_once_with(
-            mock.ANY,
-            mock.ANY,
-            delete=False,
-            compression=ZIP_DEFLATED,
-            compresslevel=None,
-        )
-

@pytest.mark.management
 class TestCryptExportImport(
@@ -1,4 +1,3 @@
-import os
 from io import StringIO
 from unittest.mock import patch

@@ -42,7 +41,7 @@ class TestFuzzyMatchCommand(TestCase):

    def test_invalid_ratio_upper_limit(self) -> None:
        """
-        GIVEN:
+        GIVEN:s
            - Invalid ratio above upper
        WHEN:
            - Command is called
@@ -109,45 +108,6 @@ class TestFuzzyMatchCommand(TestCase):
        stdout, _ = self.call_command("--processes", "1")
        self.assertIn("Found 1 matching pair(s)", stdout)

-    def test_with_matches_and_url(self) -> None:
-        """
-        GIVEN:
-            - 2 documents exist
-            - Similarity between content is 86.667
-            - --url is provided
-        WHEN:
-            - Command is called with --url
-        THEN:
-            - 1 match is returned from doc 1 to doc 2
-            - No match from doc 2 to doc 1 reported
-            - Output contains clickable links to the documents instead of titles
-        """
-        # Content similarity is 86.667
-        Document.objects.create(
-            checksum="BEEFCAFE",
-            title="A",
-            content="first document scanned by bob",
-            mime_type="application/pdf",
-            filename="test.pdf",
-        )
-        Document.objects.create(
-            checksum="DEADBEAF",
-            title="A",
-            content="first document scanned by alice",
-            mime_type="application/pdf",
-            filename="other_test.pdf",
-        )
-        with patch.dict(os.environ, {"COLUMNS": "200"}):
-            stdout, _ = self.call_command(
-                "--processes",
-                "1",
-                "--url",
-                "http://localhost:8000",
-            )
-        self.assertIn("Found 1 matching pair(s)", stdout)
-        self.assertIn("http://localhost:8000/documents/1/details", stdout)
-        self.assertIn("http://localhost:8000/documents/2/details", stdout)
-
    def test_with_3_matches(self) -> None:
        """
        GIVEN:
@@ -525,71 +525,6 @@ class TestCommandImport(
        self.assertEqual(doc.tags.count(), 1)
        self.assertEqual(doc.tags.first().name, "batch-flush-tag")

-    def test_import_rejects_unreadable_compression(self) -> None:
-        """
-        GIVEN:
-            - A zip archive with an entry whose compression this Python can't read
-        WHEN:
-            - Import is attempted
-        THEN:
-            - A CommandError naming the issue is raised, before extraction
-        """
-        import zipfile
-        from unittest import mock
-
-        archive = Path(self.dirs.scratch_dir) / "export.zip"
-        with zipfile.ZipFile(archive, "w") as zf:
-            zf.writestr("manifest.json", "[]")
-
-        with mock.patch(
-            "documents.management.commands.document_importer.compress_type_readable",
-            return_value=False,
-        ):
-            with self.assertRaises(CommandError) as e:
-                call_command(
-                    "document_importer",
-                    str(archive),
-                    "--no-progress-bar",
-                    skip_checks=True,
-                )
-        self.assertIn("compression", str(e.exception))
-
-    def test_import_rejects_unreadable_zstd_with_version_hint(self) -> None:
-        """
-        GIVEN:
-            - A zip archive with an entry compressed with zstd
-        WHEN:
-            - Import is attempted on a Python runtime that can't read zstd
-        THEN:
-            - The CommandError names the 3.14+ requirement, not just the
-              generic "can't read" message
-        """
-        import zipfile
-        from unittest import mock
-
-        archive = Path(self.dirs.scratch_dir) / "export.zip"
-        with zipfile.ZipFile(archive, "w") as zf:
-            zf.writestr("manifest.json", "[]")
-
-        with (
-            mock.patch(
-                "documents.management.commands.document_importer.compress_type_readable",
-                return_value=False,
-            ),
-            mock.patch(
-                "documents.management.commands.document_importer.unreadable_method_names",
-                return_value={"zstd"},
-            ),
-        ):
-            with self.assertRaises(CommandError) as e:
-                call_command(
-                    "document_importer",
-                    str(archive),
-                    "--no-progress-bar",
-                    skip_checks=True,
-                )
-        self.assertIn("3.14", str(e.exception))
-

@pytest.mark.management
@pytest.mark.django_db
@@ -22,7 +22,6 @@ from documents.models import StoragePath
 from documents.models import Tag
 from documents.permissions import permitted_document_ids
 from documents.permissions import permitted_object_ids
-from documents.permissions import restrict_queryset_to_visible
 from documents.serialisers import _get_viewable_duplicates
 from documents.tests.factories import CorrespondentFactory
 from documents.tests.factories import DocumentFactory
@@ -497,28 +496,6 @@ class TestPermittedObjectIdsGenericModels:
            expected_hidden=[strangers.pk],
        )

-    @pytest.mark.parametrize("is_superuser", [False, True])
-    def test_inactive_user_sees_nothing(self, model, factory, perm, is_superuser):
-        suffix = f"{model.__name__}_{is_superuser}"
-        user = User.objects.create_user(
-            username=f"inactive_{suffix}",
-            is_active=False,
-            is_superuser=is_superuser,
-        )
-        other = User.objects.create_user(username=f"other_{suffix}")
-        granted = factory(owner=other)
-        assign_perm(perm, user, granted)
-
-        assert_visible_document_ids(
-            permitted_object_ids(user, model, perm),
-            expected_visible=[],
-            expected_hidden=[
-                factory(owner=None).pk,
-                factory(owner=user).pk,
-                granted.pk,
-            ],
-        )
-
    def test_unowned_object_visible_to_everyone(self, model, factory, perm):
        user = User.objects.create_user(username=f"user_{model.__name__}")
        unowned = factory(owner=None)
@@ -737,7 +714,7 @@ class TestBulkEditObjectsTagDescendantPartialPermission:
        NOTE: this uses ``set_permissions`` (owner reassignment) rather than
        ``delete`` as the operation, because Tag.tn_parent (django-treenode)
        cascades deletes to descendants at the database/ORM level regardless
-        of which tags the view resolved into ``objs`` - a delete-based test
+        of which tags the view resolved into ``objs`` -- a delete-based test
        would pass/fail based on FK cascade behavior, not on whether the
        descendant-expansion logic itself respected per-object permissions.
        """
@@ -784,97 +761,3 @@ class TestBulkEditObjectsTagDescendantPartialPermission:
        assert parent.owner == requester
        assert permitted_child.owner == requester
        assert unpermitted_child.owner == owner
-
-
-@pytest.mark.django_db
-class TestRestrictQuerysetToVisible:
-    """restrict_queryset_to_visible() returns its queryset argument
-    unchanged only for "no restriction at all", so the cases that may do
-    that have to be kept narrow."""
-
-    def test_no_user_means_no_restriction(self) -> None:
-        """
-        GIVEN:
-            - No user at all (a system-triggered call)
-        WHEN:
-            - restrict_queryset_to_visible() is called
-        THEN:
-            - The queryset is returned unfiltered, rather than
-              permitted_object_ids(None, ...)'s narrower "unowned rows only"
-        """
-        owner = User.objects.create_user(username="vis_none_owner")
-        tag = TagFactory(owner=owner)
-
-        visible = restrict_queryset_to_visible(Tag.objects.all(), None, "view_tag")
-
-        assert tag.pk in visible.values_list("pk", flat=True)
-
-    def test_active_superuser_means_no_restriction(self) -> None:
-        """
-        GIVEN:
-            - An active superuser
-        WHEN:
-            - restrict_queryset_to_visible() is called
-        THEN:
-            - The queryset is returned unfiltered, skipping the permission
-              lookup entirely
-        """
-        superuser = User.objects.create_superuser(username="vis_active_super")
-        owner = User.objects.create_user(username="vis_active_super_owner")
-        tag = TagFactory(owner=owner)
-
-        visible = restrict_queryset_to_visible(
-            Tag.objects.all(),
-            superuser,
-            "view_tag",
-        )
-
-        assert tag.pk in visible.values_list("pk", flat=True)
-
-    def test_inactive_superuser_is_denied_not_unrestricted(self) -> None:
-        """
-        GIVEN:
-            - A deactivated superuser
-        WHEN:
-            - restrict_queryset_to_visible() is called
-        THEN:
-            - No rows are visible, never the whole unrestricted queryset -
-              deactivation has to win over the superuser shortcut, matching
-              permitted_object_ids's own ordering
-        """
-        user = User.objects.create_user(
-            username="vis_inactive_super",
-            is_active=False,
-            is_superuser=True,
-        )
-        TagFactory(owner=None)
-        TagFactory(owner=user)
-
-        visible = restrict_queryset_to_visible(Tag.objects.all(), user, "view_tag")
-
-        assert not visible.exists()
-
-    def test_regular_user_gets_permitted_ids(self) -> None:
-        """
-        GIVEN:
-            - An ordinary active user and a tag owned by someone else
-        WHEN:
-            - restrict_queryset_to_visible() is called
-        THEN:
-            - Only the rows permitted_object_ids() reports are visible
-        """
-        user = User.objects.create_user(username="vis_regular")
-        other = User.objects.create_user(username="vis_regular_other")
-        own = TagFactory(owner=user)
-        hidden = TagFactory(owner=other)
-
-        visible_ids = set(
-            restrict_queryset_to_visible(
-                Tag.objects.all(),
-                user,
-                "view_tag",
-            ).values_list("pk", flat=True),
-        )
-
-        assert own.pk in visible_ids
-        assert hidden.pk not in visible_ids
@@ -68,44 +68,3 @@ class TestPermittedObjectsFilter:
        visible_ids = set(result.values_list("id", flat=True))
        assert visible_ids == {owned.pk}
        assert granted.pk not in visible_ids
-
-    @pytest.mark.parametrize(
-        ("username", "is_superuser"),
-        [("inactive", False), ("inactive_super", True)],
-    )
-    def test_inactive_user_sees_nothing(self, username: str, *, is_superuser: bool):
-        user = User.objects.create_user(
-            username=username,
-            is_active=False,
-            is_superuser=is_superuser,
-        )
-        TagFactory(owner=None)
-        TagFactory(owner=user)
-        granted = TagFactory(owner=User.objects.create_user(username=f"o_{username}"))
-        assign_perm("view_tag", user, granted)
-        request = APIRequestFactory().get("/")
-        request.user = user
-
-        result = PermittedObjectsFilter().filter_queryset(
-            request,
-            Tag.objects.all(),
-            _DummyView(),
-        )
-        assert result.count() == 0
-
-    def test_inactive_user_sees_nothing_with_include_granted_false(self):
-        user = User.objects.create_user(username="inactive_owner", is_active=False)
-        TagFactory(owner=user)
-        TagFactory(owner=None)
-        request = APIRequestFactory().get("/")
-        request.user = user
-
-        class _OwnerOnlyFilter(PermittedObjectsFilter):
-            include_granted = False
-
-        result = _OwnerOnlyFilter().filter_queryset(
-            request,
-            Tag.objects.all(),
-            _DummyView(),
-        )
-        assert result.count() == 0
@@ -352,95 +352,20 @@ class TestAISuggestions(DirectoriesMixin, TestCase):
        mock_refresh_cache,
        mock_get_cache,
    ) -> None:
-        """
-        GIVEN:
-            - A cached LLM classification holding the raw existing_ids/
-              new_names choices (never resolved object ids)
-        WHEN:
-            - ai_suggestions is requested
-        THEN:
-            - The cached choices are resolved into ids for this request
-              (not returned verbatim from the cache) and the cache's TTL is
-              refreshed
-        """
-        mock_get_cache.return_value = MagicMock(
-            suggestions={
-                "title": "Cached Title",
-                "tags": {"existing_ids": [self.tag1.pk], "new_names": []},
-                "correspondents": {"existing_ids": [], "new_names": []},
-                "document_types": {"existing_ids": [], "new_names": []},
-                "storage_paths": {"existing_ids": [], "new_names": []},
-                "dates": [],
-            },
-        )
+        mock_get_cache.return_value = MagicMock(suggestions={"tags": ["tag1", "tag2"]})

        self.client.force_login(user=self.user)
        response = self.client.get(
            f"/api/documents/{self.document.pk}/ai_suggestions/",
        )
        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.json()["title"], "Cached Title")
-        self.assertEqual(response.json()["tags"], [self.tag1.pk])
+        self.assertEqual(response.json(), {"tags": ["tag1", "tag2"]})
        mock_get_cache.assert_called_once_with(
            self.document.pk,
            backend="mock_backend",
        )
        mock_refresh_cache.assert_called_once_with(self.document.pk)

-    @patch("documents.views.get_llm_suggestion_cache")
-    @patch("documents.views.refresh_suggestions_cache")
-    @override_settings(
-        AI_ENABLED=True,
-        LLM_BACKEND="mock_backend",
-    )
-    def test_ai_suggestions_cache_hit_re_filters_for_narrower_requester(
-        self,
-        mock_refresh_cache,
-        mock_get_cache,
-    ) -> None:
-        """
-        GIVEN:
-            - A cached LLM classification whose existing_ids include a tag
-              only visible to a broader-visibility user (e.g. the requester
-              who originally generated it)
-            - A second, non-superuser requester who may change the document
-              but has no permission to view that tag
-        WHEN:
-            - ai_suggestions is requested by the second requester and the
-              cache is hit
-        THEN:
-            - The cache hit still runs permission filtering fresh for this
-              requester; the invisible tag id does not leak into either the
-              matched or suggested tags
-        """
-        tag_owner = User.objects.create_user(username="cache_tag_owner")
-        invisible_tag = Tag.objects.create(name="cache_restricted", owner=tag_owner)
-        requester = User.objects.create_user(username="cache_requester")
-        requester.user_permissions.add(
-            *Permission.objects.filter(
-                codename__in=["view_document", "change_document", "view_tag"],
-            ),
-        )
-        mock_get_cache.return_value = MagicMock(
-            suggestions={
-                "title": "Untitled",
-                "tags": {"existing_ids": [invisible_tag.pk], "new_names": []},
-                "correspondents": {"existing_ids": [], "new_names": []},
-                "document_types": {"existing_ids": [], "new_names": []},
-                "storage_paths": {"existing_ids": [], "new_names": []},
-                "dates": [],
-            },
-        )
-
-        self.client.force_login(user=requester)
-        response = self.client.get(
-            f"/api/documents/{self.document.pk}/ai_suggestions/",
-        )
-
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.json()["tags"], [])
-        self.assertEqual(response.json()["suggested_tags"], [])
-
    @patch("documents.views.get_ai_document_classification")
    @override_settings(
        AI_ENABLED=True,
@@ -452,16 +377,10 @@ class TestAISuggestions(DirectoriesMixin, TestCase):
    ) -> None:
        mock_get_ai_classification.return_value = {
            "title": "AI Title",
-            "tags": {"existing_ids": [self.tag1.pk], "new_names": ["tag2"]},
-            "correspondents": {
-                "existing_ids": [self.correspondent1.pk],
-                "new_names": [],
-            },
-            "document_types": {
-                "existing_ids": [self.document_type1.pk],
-                "new_names": [],
-            },
-            "storage_paths": {"existing_ids": [self.path1.pk], "new_names": []},
+            "tags": ["tag1", "tag2"],
+            "correspondents": ["correspondent1"],
+            "document_types": ["type1"],
+            "storage_paths": ["path1"],
            "dates": ["2023-01-01"],
        }

@@ -503,10 +422,10 @@ class TestAISuggestions(DirectoriesMixin, TestCase):
        UiSettings.objects.create(user=self.user, settings={"language": "de-de"})
        mock_get_ai_classification.return_value = {
            "title": "KI Title",
-            "tags": {"existing_ids": [], "new_names": []},
-            "correspondents": {"existing_ids": [], "new_names": []},
-            "document_types": {"existing_ids": [], "new_names": []},
-            "storage_paths": {"existing_ids": [], "new_names": []},
+            "tags": [],
+            "correspondents": [],
+            "document_types": [],
+            "storage_paths": [],
            "dates": [],
        }

@@ -542,10 +461,10 @@ class TestAISuggestions(DirectoriesMixin, TestCase):
        UiSettings.objects.create(user=self.user, settings={"language": "de-de"})
        mock_get_ai_classification.return_value = {
            "title": "Titre IA",
-            "tags": {"existing_ids": [], "new_names": []},
-            "correspondents": {"existing_ids": [], "new_names": []},
-            "document_types": {"existing_ids": [], "new_names": []},
-            "storage_paths": {"existing_ids": [], "new_names": []},
+            "tags": [],
+            "correspondents": [],
+            "document_types": [],
+            "storage_paths": [],
            "dates": [],
        }

@@ -583,10 +502,10 @@ class TestAISuggestions(DirectoriesMixin, TestCase):
        either yields a cache miss instead of a stale hit."""
        mock_get_ai_classification.return_value = {
            "title": "Answer A",
-            "tags": {"existing_ids": [], "new_names": []},
-            "correspondents": {"existing_ids": [], "new_names": []},
-            "document_types": {"existing_ids": [], "new_names": []},
-            "storage_paths": {"existing_ids": [], "new_names": []},
+            "tags": [],
+            "correspondents": [],
+            "document_types": [],
+            "storage_paths": [],
            "dates": [],
        }

@@ -660,132 +579,6 @@ class TestAISuggestions(DirectoriesMixin, TestCase):
            get_llm_suggestion_cache(self.document.pk, backend="openai-like"),
        )

-    @patch("documents.views.get_ai_document_classification")
-    @override_settings(
-        AI_ENABLED=True,
-        LLM_BACKEND="mock_backend",
-    )
-    def test_ai_suggestions_combines_existing_ids_and_new_names(
-        self,
-        mock_get_ai_classification,
-    ) -> None:
-        """
-        GIVEN:
-            - AI classification returns a taxonomy choice with both an
-              existing tag id and a new tag name not present in the database
-        WHEN:
-            - ai_suggestions is requested
-        THEN:
-            - the existing id is resolved into the matched tags list
-            - the new name is fuzzy-matched, and since it doesn't match any
-              existing tag, it is surfaced as a suggested tag
-        """
-        mock_get_ai_classification.return_value = {
-            "title": "Lab Report",
-            "tags": {"existing_ids": [self.tag1.pk], "new_names": ["Follow-up"]},
-            "correspondents": {"existing_ids": [], "new_names": []},
-            "document_types": {"existing_ids": [], "new_names": []},
-            "storage_paths": {"existing_ids": [], "new_names": []},
-            "dates": [],
-        }
-
-        self.client.force_login(user=self.user)
-        response = self.client.get(
-            f"/api/documents/{self.document.pk}/ai_suggestions/",
-        )
-
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.json()["tags"], [self.tag1.pk])
-        self.assertEqual(response.json()["suggested_tags"], ["Follow-up"])
-
-    @patch("documents.views.get_ai_document_classification")
-    @override_settings(
-        AI_ENABLED=True,
-        LLM_BACKEND="mock_backend",
-    )
-    def test_ai_suggestions_deduplicates_id_matched_via_both_paths(
-        self,
-        mock_get_ai_classification,
-    ) -> None:
-        """
-        GIVEN:
-            - AI classification returns the same tag both as an existing_id
-              and as a new_name that fuzzy-matches that same tag
-        WHEN:
-            - ai_suggestions is requested
-        THEN:
-            - The tag's id appears exactly once in the response, not twice
-        """
-        mock_get_ai_classification.return_value = {
-            "title": "Lab Report",
-            "tags": {
-                "existing_ids": [self.tag1.pk],
-                "new_names": [self.tag1.name],
-            },
-            "correspondents": {"existing_ids": [], "new_names": []},
-            "document_types": {"existing_ids": [], "new_names": []},
-            "storage_paths": {"existing_ids": [], "new_names": []},
-            "dates": [],
-        }
-
-        self.client.force_login(user=self.user)
-        response = self.client.get(
-            f"/api/documents/{self.document.pk}/ai_suggestions/",
-        )
-
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.json()["tags"], [self.tag1.pk])
-        self.assertEqual(response.json()["suggested_tags"], [])
-
-    @patch("documents.views.get_ai_document_classification")
-    @override_settings(
-        AI_ENABLED=True,
-        LLM_BACKEND="mock_backend",
-    )
-    def test_ai_suggestions_existing_id_not_visible_falls_through_to_suggested(
-        self,
-        mock_get_ai_classification,
-    ) -> None:
-        """
-        GIVEN:
-            - A non-superuser who may change the document but has no
-              permission to view a tag owned by somebody else
-            - AI classification returns that tag's id in existing_ids (e.g.
-              from a cached response generated for a broader-visibility user)
-        WHEN:
-            - ai_suggestions is requested by that user
-        THEN:
-            - the invisible id is silently dropped by resolve_tag_ids, so
-              permission filtering survives the full request path
-            - it does not appear in either the matched or suggested tags
-        """
-        tag_owner = User.objects.create_user(username="tagowner")
-        invisible_tag = Tag.objects.create(name="restricted", owner=tag_owner)
-        requester = User.objects.create_user(username="requester")
-        requester.user_permissions.add(
-            *Permission.objects.filter(
-                codename__in=["view_document", "change_document", "view_tag"],
-            ),
-        )
-
-        mock_get_ai_classification.return_value = {
-            "title": "Untitled",
-            "tags": {"existing_ids": [invisible_tag.pk], "new_names": []},
-            "correspondents": {"existing_ids": [], "new_names": []},
-            "document_types": {"existing_ids": [], "new_names": []},
-            "storage_paths": {"existing_ids": [], "new_names": []},
-            "dates": [],
-        }
-
-        self.client.force_login(user=requester)
-        response = self.client.get(
-            f"/api/documents/{self.document.pk}/ai_suggestions/",
-        )
-
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.json()["tags"], [])
-        self.assertEqual(response.json()["suggested_tags"], [])
-
    def test_invalidate_suggestions_cache(self) -> None:
        self.client.force_login(user=self.user)
        suggestions = {
@@ -2000,55 +2000,6 @@ class TestWorkflows(
                r"Doc added in \w{3,}",
            )  # Match any 3-letter month name

-    def test_document_updated_workflow_existing_custom_field_empty_value(self) -> None:
-        """
-        GIVEN:
-            - Existing workflow with UPDATED trigger and action that assigns a custom field
-              with an empty value
-        WHEN:
-            - Document is updated that already contains the field with a value
-        THEN:
-            - The existing value is left untouched, see GH #13627
-        """
-        trigger = WorkflowTrigger.objects.create(
-            type=WorkflowTrigger.WorkflowTriggerType.DOCUMENT_UPDATED,
-            filter_has_document_type=self.dt,
-        )
-        action = WorkflowAction.objects.create()
-        action.assign_custom_fields.add(self.cf1)
-        action.assign_custom_fields_values = {self.cf1.pk: ""}
-        action.save()
-        w = Workflow.objects.create(
-            name="Workflow 1",
-            order=0,
-        )
-        w.triggers.add(trigger)
-        w.actions.add(action)
-        w.save()
-
-        doc = Document.objects.create(
-            title="sample test",
-            correspondent=self.c,
-            original_filename="sample.pdf",
-        )
-        CustomFieldInstance.objects.create(
-            document=doc,
-            field=self.cf1,
-            value_text="existing value",
-        )
-
-        superuser = User.objects.create_superuser("superuser")
-        self.client.force_authenticate(user=superuser)
-
-        self.client.patch(
-            f"/api/documents/{doc.id}/",
-            {"document_type": self.dt.id},
-            format="json",
-        )
-
-        doc.refresh_from_db()
-        self.assertEqual(doc.custom_fields.get(field=self.cf1).value, "existing value")
-
    def test_document_updated_workflow_existing_custom_field(self) -> None:
        """
        GIVEN:
@@ -7,7 +7,6 @@ import tempfile
 import zipfile
 from collections import defaultdict
 from collections import deque
-from collections.abc import Callable
 from datetime import datetime
 from datetime import timedelta
 from http import HTTPStatus
@@ -250,10 +249,6 @@ from paperless_ai.matching import match_correspondents_by_name
 from paperless_ai.matching import match_document_types_by_name
 from paperless_ai.matching import match_storage_paths_by_name
 from paperless_ai.matching import match_tags_by_name
-from paperless_ai.matching import resolve_correspondent_ids
-from paperless_ai.matching import resolve_document_type_ids
-from paperless_ai.matching import resolve_storage_path_ids
-from paperless_ai.matching import resolve_tag_ids
 from paperless_mail.models import MailAccount
 from paperless_mail.models import MailRule
 from paperless_mail.oauth import PaperlessMailOAuth2Manager
@@ -263,9 +258,6 @@ from paperless_mail.serialisers import MailRuleSerializer
 if settings.AUDIT_LOG_ENABLED:
    from auditlog.models import LogEntry

-if TYPE_CHECKING:
-    from paperless_ai.base_model import TaxonomyChoiceDict
-

 logger = logging.getLogger("paperless.api")

@@ -1554,126 +1546,80 @@ class DocumentViewSet(
        )

        if cached_llm_suggestions:
-            # Only the raw model choices are cached, never resolved object
-            # ids. resolve_choice() below still runs permission filtering
-            # freshly for this requester on every request, cache hit or not,
-            # so a resolved id cached for one user's visibility can never be
-            # handed unfiltered to a second, less-privileged requester of
-            # the same (backend-keyed, not user-keyed) cache entry.
            refresh_suggestions_cache(doc.pk)
-            llm_suggestions = cached_llm_suggestions.suggestions
-        else:
-            try:
-                llm_suggestions = get_ai_document_classification(
-                    doc,
-                    request.user,
-                    output_language,
-                )
-            except ValueError as exc:
-                logger.exception(
-                    "Invalid AI configuration while generating suggestions for "
-                    "document %s: %s",
-                    doc.pk,
-                    exc,
-                    exc_info=True,
-                )
-                raise ValidationError(
-                    {"ai": [_("Invalid AI configuration.")]},
-                ) from exc
-            except LLMTimeoutError as exc:
-                logger.exception(
-                    "AI backend timed out while generating suggestions for "
-                    "document %s: %s",
-                    doc.pk,
-                    exc,
-                    exc_info=True,
-                )
-                return Response(
-                    {"ai": [_("AI backend request timed out.")]},
-                    status=status.HTTP_503_SERVICE_UNAVAILABLE,
-                )
-            set_llm_suggestions_cache(
-                doc.pk,
-                llm_suggestions,
-                backend=llm_cache_backend,
-            )
+            return Response(cached_llm_suggestions.suggestions)

-        tags_choice: TaxonomyChoiceDict = llm_suggestions["tags"]
-        correspondents_choice: TaxonomyChoiceDict = llm_suggestions["correspondents"]
-        document_types_choice: TaxonomyChoiceDict = llm_suggestions["document_types"]
-        storage_paths_choice: TaxonomyChoiceDict = llm_suggestions["storage_paths"]
-
-        def resolve_choice(
-            choice: "TaxonomyChoiceDict",
-            resolve_ids: Callable[[list[int], User], list],
-            match_names: Callable[[list[str], User], list],
-        ) -> list:
-            """The ids the model picked from the candidates it was shown, plus
-            name matches for the values it proposed as new. The schema allows
-            the same object to satisfy both an existing_id and a new_name in
-            one valid response, so results are deduplicated by pk (keeping
-            first-seen order) rather than trusting the two lookups to be
-            disjoint.
-            """
-            matched = resolve_ids(choice["existing_ids"], request.user) + match_names(
-                choice["new_names"],
+        try:
+            llm_suggestions = get_ai_document_classification(
+                doc,
                request.user,
+                output_language,
+            )
+        except ValueError as exc:
+            logger.exception(
+                "Invalid AI configuration while generating suggestions for "
+                "document %s: %s",
+                doc.pk,
+                exc,
+                exc_info=True,
+            )
+            raise ValidationError({"ai": [_("Invalid AI configuration.")]}) from exc
+        except LLMTimeoutError as exc:
+            logger.exception(
+                "AI backend timed out while generating suggestions for document %s: %s",
+                doc.pk,
+                exc,
+                exc_info=True,
+            )
+            return Response(
+                {"ai": [_("AI backend request timed out.")]},
+                status=status.HTTP_503_SERVICE_UNAVAILABLE,
            )
-            seen_ids: set[int] = set()
-            deduped = []
-            for obj in matched:
-                if obj.pk in seen_ids:
-                    continue
-                seen_ids.add(obj.pk)
-                deduped.append(obj)
-            return deduped

-        matched_tags = resolve_choice(
-            tags_choice,
-            resolve_tag_ids,
-            match_tags_by_name,
+        matched_tags = match_tags_by_name(
+            llm_suggestions.get("tags", []),
+            request.user,
        )
-        matched_correspondents = resolve_choice(
-            correspondents_choice,
-            resolve_correspondent_ids,
-            match_correspondents_by_name,
+        matched_correspondents = match_correspondents_by_name(
+            llm_suggestions.get("correspondents", []),
+            request.user,
        )
-        matched_types = resolve_choice(
-            document_types_choice,
-            resolve_document_type_ids,
-            match_document_types_by_name,
+        matched_types = match_document_types_by_name(
+            llm_suggestions.get("document_types", []),
+            request.user,
        )
-        matched_paths = resolve_choice(
-            storage_paths_choice,
-            resolve_storage_path_ids,
-            match_storage_paths_by_name,
+        matched_paths = match_storage_paths_by_name(
+            llm_suggestions.get("storage_paths", []),
+            request.user,
        )

        resp_data = {
-            "title": llm_suggestions["title"],
+            "title": llm_suggestions.get("title"),
            "tags": [t.id for t in matched_tags],
            "suggested_tags": extract_unmatched_names(
-                tags_choice["new_names"],
+                llm_suggestions.get("tags", []),
                matched_tags,
            ),
            "correspondents": [c.id for c in matched_correspondents],
            "suggested_correspondents": extract_unmatched_names(
-                correspondents_choice["new_names"],
+                llm_suggestions.get("correspondents", []),
                matched_correspondents,
            ),
            "document_types": [d.id for d in matched_types],
            "suggested_document_types": extract_unmatched_names(
-                document_types_choice["new_names"],
+                llm_suggestions.get("document_types", []),
                matched_types,
            ),
            "storage_paths": [s.id for s in matched_paths],
            "suggested_storage_paths": extract_unmatched_names(
-                storage_paths_choice["new_names"],
+                llm_suggestions.get("storage_paths", []),
                matched_paths,
            ),
-            "dates": llm_suggestions["dates"],
+            "dates": llm_suggestions.get("dates", []),
        }

+        set_llm_suggestions_cache(doc.pk, resp_data, backend=llm_cache_backend)
+
        return Response(resp_data)

    @action(methods=["get"], detail=True, filter_backends=[])
@@ -2321,7 +2267,7 @@ class ChatStreamingView(GenericAPIView[Any]):
            if not has_perms_owner_aware(request.user, "view_document", document):
                return HttpResponseForbidden("Insufficient permissions")

-            documents = Document.objects.filter(pk=document.pk)
+            documents = [document]
        else:
            documents = Document.objects.filter(
                id__in=permitted_document_ids(request.user),
@@ -105,8 +105,7 @@ def apply_assignment_to_document(
                field=field,
                document=document,
            ).first()
-            # empty string is indistinguishable from no value in the UI
-            if instance and args[value_field_name] not in (None, ""):
+            if instance and args[value_field_name] is not None:
                setattr(instance, value_field_name, args[value_field_name])
                instance.save()
            elif not instance:
@@ -19,10 +19,7 @@ class AutoLoginMiddleware(MiddlewareMixin):
        if request.path.startswith("/api/token/") and request.method == "POST":
            return None
        try:
-            request.user = User.objects.get(
-                username=settings.AUTO_LOGIN_USERNAME,
-                is_active=True,
-            )
+            request.user = User.objects.get(username=settings.AUTO_LOGIN_USERNAME)
            auth.login(
                request=request,
                user=request.user,
@@ -3,9 +3,7 @@ Built-in remote-OCR document parser.

 Handles documents by sending them to a configured remote OCR engine
 (currently Azure AI Vision / Document Intelligence) and retrieving both
-the extracted text and a searchable PDF with an embedded text layer. For
-born-digital PDFs that need no archive copy, the remote call is skipped
-entirely in favor of locally-extracted text (see ``RemoteDocumentParser.parse``).
+the extracted text and a searchable PDF with an embedded text layer.

 When no engine is configured, ``score()`` returns ``None`` so the parser
 is effectively invisible to the registry — the tesseract parser handles
@@ -24,8 +22,6 @@ from typing import Self
 from django.conf import settings

 from documents.parsers import ParseError
-from paperless.parsers.utils import extract_pdf_text
-from paperless.parsers.utils import post_process_text
 from paperless.version import __full_version_str__

 if TYPE_CHECKING:
@@ -74,11 +70,8 @@ class RemoteDocumentParser:
    """Parse documents via a remote OCR API (currently Azure AI Vision).

    This parser sends documents to a remote engine that returns both
-    extracted text and a searchable PDF with an embedded text layer,
-    except when ``parse()`` is called with ``produce_archive=False`` for
-    a PDF, in which case the remote call is skipped and only locally
-    extracted text is returned (no archive). It does not depend on
-    Tesseract or ocrmypdf.
+    extracted text and a searchable PDF with an embedded text layer.
+    It does not depend on Tesseract or ocrmypdf.

    Class attributes
    ----------------
@@ -167,11 +160,8 @@ class RemoteDocumentParser:
        Returns
        -------
        bool
-            Always True — the remote engine is capable of returning a PDF
-            with an embedded text layer to serve as the archive copy.
-            Whether it actually does so for a given document depends on
-            ``produce_archive`` passed to :meth:`parse` (see there for when
-            the remote engine call, and thus archive generation, is skipped).
+            Always True — the remote engine always returns a PDF with an
+            embedded text layer that serves as the archive copy.
        """
        return True

@@ -228,12 +218,6 @@ class RemoteDocumentParser:
    ) -> None:
        """Send the document to the remote engine and store results.

-        When *produce_archive* is False for a PDF, the caller (via
-        ``documents.consumer.should_produce_archive``) has already determined
-        that the document is born-digital and needs no archive — skip the
-        remote engine entirely rather than re-OCRing it and creating a
-        duplicate text layer.
-
        Parameters
        ----------
        document_path:
@@ -241,8 +225,8 @@ class RemoteDocumentParser:
        mime_type:
            Detected MIME type of the document.
        produce_archive:
-            Whether an archive copy is wanted. For PDFs, False skips the
-            remote engine and uses locally-extracted text instead.
+            Ignored — the remote engine always returns a searchable PDF,
+            which is stored as the archive copy regardless of this flag.
        """
        config = RemoteEngineConfig(
            engine=settings.REMOTE_OCR_ENGINE,
@@ -257,16 +241,6 @@ class RemoteDocumentParser:
            self._text = ""
            return

-        if not produce_archive and mime_type == "application/pdf":
-            logger.debug(
-                "Remote OCR: skipped — no archive requested, "
-                "using locally-extracted text",
-            )
-            self._text = (
-                post_process_text(extract_pdf_text(document_path, log=logger)) or ""
-            )
-            return
-
        if config.engine == "azureai":
            self._text = self._azure_ai_vision_parse(document_path, config)

@@ -337,117 +337,6 @@ class TestRemoteParserParse:
        assert remote_parser.get_date() is None


-# ---------------------------------------------------------------------------
-# parse() — produce_archive=False skips the remote engine (PDFs only)
-# ---------------------------------------------------------------------------
-
-
-class TestRemoteParserSkipsWhenNoArchiveWanted:
-    """When the caller has already decided no archive is needed for a PDF
-    (documents.consumer.should_produce_archive), the remote engine call is
-    skipped entirely in favor of locally-extracted text.
-    """
-
-    def test_pdf_skips_azure_when_no_archive_requested(
-        self,
-        remote_parser: RemoteDocumentParser,
-        simple_digital_pdf_file: Path,
-        azure_client: Mock,
-    ) -> None:
-        """
-        GIVEN: produce_archive=False for a PDF
-        WHEN:  parse() is called
-        THEN:  Azure is never invoked, no archive is produced, and text
-               comes from local pdftotext extraction
-        """
-        remote_parser.parse(
-            simple_digital_pdf_file,
-            "application/pdf",
-            produce_archive=False,
-        )
-
-        azure_client.begin_analyze_document.assert_not_called()
-        assert remote_parser.get_archive_path() is None
-        assert remote_parser.get_text() != ""
-
-    def test_pdf_no_archive_requested_text_matches_local_extraction(
-        self,
-        remote_parser: RemoteDocumentParser,
-        simple_digital_pdf_file: Path,
-        azure_client: Mock,
-        mocker: MockerFixture,
-    ) -> None:
-        """
-        GIVEN: produce_archive=False for a PDF
-        WHEN:  parse() is called
-        THEN:  the returned text is exactly the locally-extracted text,
-               not anything from the (unused) Azure mock
-        """
-        mocker.patch(
-            "paperless.parsers.remote.extract_pdf_text",
-            return_value="Local digital text.",
-        )
-
-        remote_parser.parse(
-            simple_digital_pdf_file,
-            "application/pdf",
-            produce_archive=False,
-        )
-
-        assert remote_parser.get_text() == "Local digital text."
-
-    def test_pdf_no_archive_requested_closes_no_client(
-        self,
-        remote_parser: RemoteDocumentParser,
-        simple_digital_pdf_file: Path,
-        azure_client: Mock,
-    ) -> None:
-        remote_parser.parse(
-            simple_digital_pdf_file,
-            "application/pdf",
-            produce_archive=False,
-        )
-
-        azure_client.close.assert_not_called()
-
-    def test_non_pdf_still_calls_azure_when_no_archive_requested(
-        self,
-        remote_parser: RemoteDocumentParser,
-        simple_digital_pdf_file: Path,
-        azure_client: Mock,
-    ) -> None:
-        """
-        Images have no local-text fallback, so produce_archive=False does
-        not skip the remote engine for non-PDF MIME types.
-        """
-        remote_parser.parse(
-            simple_digital_pdf_file,
-            "image/png",
-            produce_archive=False,
-        )
-
-        azure_client.begin_analyze_document.assert_called_once()
-        assert remote_parser.get_text() == _DEFAULT_TEXT
-
-    @pytest.mark.usefixtures("no_engine_settings")
-    def test_unconfigured_engine_takes_precedence_over_skip(
-        self,
-        remote_parser: RemoteDocumentParser,
-        simple_digital_pdf_file: Path,
-    ) -> None:
-        """An unconfigured engine still short-circuits before the
-        produce_archive check, returning empty text as before.
-        """
-        remote_parser.parse(
-            simple_digital_pdf_file,
-            "application/pdf",
-            produce_archive=False,
-        )
-
-        assert remote_parser.get_text() == ""
-        assert remote_parser.get_archive_path() is None
-
-
 # ---------------------------------------------------------------------------
 # parse() — Azure failure path
 # ---------------------------------------------------------------------------
--- a/Show More
+++ b/Show More