Chore: ditch the abandoned ngx-bootstrap-icons, roll our own (#14665)

src-ui/src/app/components/common/bootstrap-icon/bootstrap-icon.component.spec.ts

@@ -0,0 +1,61 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing'
+import { BootstrapIconComponent } from './bootstrap-icon.component'
+
+describe('BootstrapIconComponent', () => {
+  let fixture: ComponentFixture<BootstrapIconComponent>
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [BootstrapIconComponent],
+    })
+    fixture = TestBed.createComponent(BootstrapIconComponent)
+  })
+
+  it('should render the named icon as inline svg', () => {
+    fixture.componentRef.setInput('name', 'arrow-down-up')
+    fixture.detectChanges()
+    const svg: SVGElement = fixture.nativeElement.querySelector('svg')
+    expect(svg.classList).toContain('bi-arrow-down-up')
+    expect(svg.getAttribute('width')).toEqual('16')
+    expect(svg.getAttribute('height')).toEqual('16')
+  })
+
+  it('should apply width and height', () => {
+    fixture.componentRef.setInput('name', 'x-lg')
+    fixture.componentRef.setInput('width', '1.2em')
+    fixture.componentRef.setInput('height', 2)
+    fixture.detectChanges()
+    const svg: SVGElement = fixture.nativeElement.querySelector('svg')
+    expect(svg.getAttribute('width')).toEqual('1.2em')
+    expect(svg.getAttribute('height')).toEqual('2')
+  })
+
+  it('should not allow width or height to inject attributes', () => {
+    fixture.componentRef.setInput('name', 'x-lg')
+    fixture.componentRef.setInput('width', '1" onload="alert(1)')
+    fixture.componentRef.setInput('height', '1" onclick="alert(1)')
+    fixture.detectChanges()
+    const svg: SVGElement = fixture.nativeElement.querySelector('svg')
+    expect(svg.hasAttribute('onload')).toBe(false)
+    expect(svg.hasAttribute('onclick')).toBe(false)
+    expect(svg.getAttribute('width')).toEqual('1" onload="alert(1)')
+  })
+
+  it('should update when the name changes', () => {
+    fixture.componentRef.setInput('name', 'x-lg')
+    fixture.detectChanges()
+    fixture.componentRef.setInput('name', 'sliders2-vertical')
+    fixture.detectChanges()
+    expect(fixture.nativeElement.querySelector('svg').classList).toContain(
+      'bi-sliders2-vertical'
+    )
+  })
+
+  it('should render nothing and warn for an unregistered icon', () => {
+    const warnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {})
+    fixture.componentRef.setInput('name', 'not-an-icon')
+    fixture.detectChanges()
+    expect(fixture.nativeElement.innerHTML).toEqual('')
+    expect(warnSpy).toHaveBeenCalledWith('Icon not found: not-an-icon')
+  })
+})

src-ui/src/app/components/common/bootstrap-icon/bootstrap-icon.component.ts

@@ -0,0 +1,54 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  effect,
+  ElementRef,
+  inject,
+  input,
+} from '@angular/core'
+import { icons } from './icons'
+
+/** Converts icon name e.g. `arrow-down-up` to its registry key. */
+const toKey = (name: string) =>
+  name.trim().replace(/-(.)/g, (_, char: string) => char.toUpperCase())
+
+/**
+ * Renders an icon from the official bootstrap-icons package as inline SVG.
+ * Icons must be registered in `./icons.ts`.
+ */
+@Component({
+  selector: 'pngx-bs-icon',
+  template: '',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class BootstrapIconComponent {
+  private readonly elementRef = inject(ElementRef<HTMLElement>)
+
+  readonly name = input<string>()
+  readonly width = input<string | number>()
+  readonly height = input<string | number>()
+
+  constructor() {
+    effect(() => {
+      const element = this.elementRef.nativeElement
+      element.innerHTML = this.svg()
+      const svg = element.firstElementChild
+      if (!svg) return
+      const width = this.width()
+      const height = this.height()
+      if (width) svg.setAttribute('width', String(width))
+      if (height) svg.setAttribute('height', String(height))
+    })
+  }
+
+  private svg(): string {
+    const name = this.name()
+    if (!name) return ''
+    const svg = icons[toKey(name)]
+    if (!svg) {
+      console.warn(`Icon not found: ${name}`)
+      return ''
+    }
+    return svg
+  }
+}

src-ui/src/app/components/common/bootstrap-icon/icons.ts

@@ -0,0 +1,317 @@
+import airplane from 'bootstrap-icons/icons/airplane.svg'
+import archive from 'bootstrap-icons/icons/archive.svg'
+import arrowClockwise from 'bootstrap-icons/icons/arrow-clockwise.svg'
+import arrowCounterclockwise from 'bootstrap-icons/icons/arrow-counterclockwise.svg'
+import arrowDownUp from 'bootstrap-icons/icons/arrow-down-up.svg'
+import arrowDown from 'bootstrap-icons/icons/arrow-down.svg'
+import arrowLeft from 'bootstrap-icons/icons/arrow-left.svg'
+import arrowRepeat from 'bootstrap-icons/icons/arrow-repeat.svg'
+import arrowReturnLeft from 'bootstrap-icons/icons/arrow-return-left.svg'
+import arrowRightShort from 'bootstrap-icons/icons/arrow-right-short.svg'
+import arrowRight from 'bootstrap-icons/icons/arrow-right.svg'
+import arrowUpRight from 'bootstrap-icons/icons/arrow-up-right.svg'
+import asterisk from 'bootstrap-icons/icons/asterisk.svg'
+import bank from 'bootstrap-icons/icons/bank.svg'
+import basket from 'bootstrap-icons/icons/basket.svg'
+import bell from 'bootstrap-icons/icons/bell.svg'
+import bodyText from 'bootstrap-icons/icons/body-text.svg'
+import bookmark from 'bootstrap-icons/icons/bookmark.svg'
+import boxArrowInRight from 'bootstrap-icons/icons/box-arrow-in-right.svg'
+import boxArrowUpRight from 'bootstrap-icons/icons/box-arrow-up-right.svg'
+import boxArrowUp from 'bootstrap-icons/icons/box-arrow-up.svg'
+import boxes from 'bootstrap-icons/icons/boxes.svg'
+import braces from 'bootstrap-icons/icons/braces.svg'
+import briefcase from 'bootstrap-icons/icons/briefcase.svg'
+import building from 'bootstrap-icons/icons/building.svg'
+import calculator from 'bootstrap-icons/icons/calculator.svg'
+import calendarEventFill from 'bootstrap-icons/icons/calendar-event-fill.svg'
+import calendarEvent from 'bootstrap-icons/icons/calendar-event.svg'
+import calendar from 'bootstrap-icons/icons/calendar.svg'
+import camera from 'bootstrap-icons/icons/camera.svg'
+import cardChecklist from 'bootstrap-icons/icons/card-checklist.svg'
+import cardHeading from 'bootstrap-icons/icons/card-heading.svg'
+import caretDown from 'bootstrap-icons/icons/caret-down.svg'
+import caretUp from 'bootstrap-icons/icons/caret-up.svg'
+import cash from 'bootstrap-icons/icons/cash.svg'
+import chatLeftText from 'bootstrap-icons/icons/chat-left-text.svg'
+import chatSquareDots from 'bootstrap-icons/icons/chat-square-dots.svg'
+import checkAll from 'bootstrap-icons/icons/check-all.svg'
+import checkCircleFill from 'bootstrap-icons/icons/check-circle-fill.svg'
+import checkCircle from 'bootstrap-icons/icons/check-circle.svg'
+import checkLg from 'bootstrap-icons/icons/check-lg.svg'
+import check from 'bootstrap-icons/icons/check.svg'
+import check2All from 'bootstrap-icons/icons/check2-all.svg'
+import chevronDoubleLeft from 'bootstrap-icons/icons/chevron-double-left.svg'
+import chevronDoubleRight from 'bootstrap-icons/icons/chevron-double-right.svg'
+import chevronDown from 'bootstrap-icons/icons/chevron-down.svg'
+import chevronRight from 'bootstrap-icons/icons/chevron-right.svg'
+import chevronUp from 'bootstrap-icons/icons/chevron-up.svg'
+import circle from 'bootstrap-icons/icons/circle.svg'
+import clipboardCheckFill from 'bootstrap-icons/icons/clipboard-check-fill.svg'
+import clipboardCheck from 'bootstrap-icons/icons/clipboard-check.svg'
+import clipboardFill from 'bootstrap-icons/icons/clipboard-fill.svg'
+import clipboard from 'bootstrap-icons/icons/clipboard.svg'
+import clockHistory from 'bootstrap-icons/icons/clock-history.svg'
+import cpu from 'bootstrap-icons/icons/cpu.svg'
+import creditCard from 'bootstrap-icons/icons/credit-card.svg'
+import dashCircle from 'bootstrap-icons/icons/dash-circle.svg'
+import dash from 'bootstrap-icons/icons/dash.svg'
+import diagram3 from 'bootstrap-icons/icons/diagram-3.svg'
+import dice5 from 'bootstrap-icons/icons/dice-5.svg'
+import doorOpen from 'bootstrap-icons/icons/door-open.svg'
+import download from 'bootstrap-icons/icons/download.svg'
+import envelopeAtFill from 'bootstrap-icons/icons/envelope-at-fill.svg'
+import envelopeAt from 'bootstrap-icons/icons/envelope-at.svg'
+import envelope from 'bootstrap-icons/icons/envelope.svg'
+import exclamationCircleFill from 'bootstrap-icons/icons/exclamation-circle-fill.svg'
+import exclamationTriangleFill from 'bootstrap-icons/icons/exclamation-triangle-fill.svg'
+import exclamationTriangle from 'bootstrap-icons/icons/exclamation-triangle.svg'
+import eye from 'bootstrap-icons/icons/eye.svg'
+import fileEarmarkArrowUp from 'bootstrap-icons/icons/file-earmark-arrow-up.svg'
+import fileEarmarkCheck from 'bootstrap-icons/icons/file-earmark-check.svg'
+import fileEarmarkDiff from 'bootstrap-icons/icons/file-earmark-diff.svg'
+import fileEarmarkFill from 'bootstrap-icons/icons/file-earmark-fill.svg'
+import fileEarmarkLock from 'bootstrap-icons/icons/file-earmark-lock.svg'
+import fileEarmarkMedical from 'bootstrap-icons/icons/file-earmark-medical.svg'
+import fileEarmarkMinus from 'bootstrap-icons/icons/file-earmark-minus.svg'
+import fileEarmarkPerson from 'bootstrap-icons/icons/file-earmark-person.svg'
+import fileEarmarkPlus from 'bootstrap-icons/icons/file-earmark-plus.svg'
+import fileEarmarkRichtext from 'bootstrap-icons/icons/file-earmark-richtext.svg'
+import fileEarmarkSpreadsheet from 'bootstrap-icons/icons/file-earmark-spreadsheet.svg'
+import fileEarmark from 'bootstrap-icons/icons/file-earmark.svg'
+import fileText from 'bootstrap-icons/icons/file-text.svg'
+import files from 'bootstrap-icons/icons/files.svg'
+import filter from 'bootstrap-icons/icons/filter.svg'
+import floppy from 'bootstrap-icons/icons/floppy.svg'
+import folderFill from 'bootstrap-icons/icons/folder-fill.svg'
+import folder from 'bootstrap-icons/icons/folder.svg'
+import funnel from 'bootstrap-icons/icons/funnel.svg'
+import gear from 'bootstrap-icons/icons/gear.svg'
+import globe2 from 'bootstrap-icons/icons/globe2.svg'
+import google from 'bootstrap-icons/icons/google.svg'
+import grid from 'bootstrap-icons/icons/grid.svg'
+import gripVertical from 'bootstrap-icons/icons/grip-vertical.svg'
+import hash from 'bootstrap-icons/icons/hash.svg'
+import hddStack from 'bootstrap-icons/icons/hdd-stack.svg'
+import heart from 'bootstrap-icons/icons/heart.svg'
+import house from 'bootstrap-icons/icons/house.svg'
+import inbox from 'bootstrap-icons/icons/inbox.svg'
+import infoCircle from 'bootstrap-icons/icons/info-circle.svg'
+import journalBookmarkFill from 'bootstrap-icons/icons/journal-bookmark-fill.svg'
+import journals from 'bootstrap-icons/icons/journals.svg'
+import lightbulb from 'bootstrap-icons/icons/lightbulb.svg'
+import link from 'bootstrap-icons/icons/link.svg'
+import listNested from 'bootstrap-icons/icons/list-nested.svg'
+import listTask from 'bootstrap-icons/icons/list-task.svg'
+import listUl from 'bootstrap-icons/icons/list-ul.svg'
+import list from 'bootstrap-icons/icons/list.svg'
+import microsoft from 'bootstrap-icons/icons/microsoft.svg'
+import newspaper from 'bootstrap-icons/icons/newspaper.svg'
+import nodePlus from 'bootstrap-icons/icons/node-plus.svg'
+import paperclip from 'bootstrap-icons/icons/paperclip.svg'
+import pencil from 'bootstrap-icons/icons/pencil.svg'
+import peopleFill from 'bootstrap-icons/icons/people-fill.svg'
+import people from 'bootstrap-icons/icons/people.svg'
+import personCircle from 'bootstrap-icons/icons/person-circle.svg'
+import personFillLock from 'bootstrap-icons/icons/person-fill-lock.svg'
+import personFill from 'bootstrap-icons/icons/person-fill.svg'
+import personLock from 'bootstrap-icons/icons/person-lock.svg'
+import personSquare from 'bootstrap-icons/icons/person-square.svg'
+import person from 'bootstrap-icons/icons/person.svg'
+import playFill from 'bootstrap-icons/icons/play-fill.svg'
+import plusCircle from 'bootstrap-icons/icons/plus-circle.svg'
+import plus from 'bootstrap-icons/icons/plus.svg'
+import printer from 'bootstrap-icons/icons/printer.svg'
+import questionCircle from 'bootstrap-icons/icons/question-circle.svg'
+import receipt from 'bootstrap-icons/icons/receipt.svg'
+import safe from 'bootstrap-icons/icons/safe.svg'
+import scissors from 'bootstrap-icons/icons/scissors.svg'
+import search from 'bootstrap-icons/icons/search.svg'
+import send from 'bootstrap-icons/icons/send.svg'
+import shop from 'bootstrap-icons/icons/shop.svg'
+import slashCircle from 'bootstrap-icons/icons/slash-circle.svg'
+import sliders2Vertical from 'bootstrap-icons/icons/sliders2-vertical.svg'
+import sortAlphaDown from 'bootstrap-icons/icons/sort-alpha-down.svg'
+import sortAlphaUpAlt from 'bootstrap-icons/icons/sort-alpha-up-alt.svg'
+import stack from 'bootstrap-icons/icons/stack.svg'
+import stars from 'bootstrap-icons/icons/stars.svg'
+import tagFill from 'bootstrap-icons/icons/tag-fill.svg'
+import tag from 'bootstrap-icons/icons/tag.svg'
+import tags from 'bootstrap-icons/icons/tags.svg'
+import telephone from 'bootstrap-icons/icons/telephone.svg'
+import textIndentLeft from 'bootstrap-icons/icons/text-indent-left.svg'
+import textLeft from 'bootstrap-icons/icons/text-left.svg'
+import threeDotsVertical from 'bootstrap-icons/icons/three-dots-vertical.svg'
+import threeDots from 'bootstrap-icons/icons/three-dots.svg'
+import trash from 'bootstrap-icons/icons/trash.svg'
+import truck from 'bootstrap-icons/icons/truck.svg'
+import uiRadios from 'bootstrap-icons/icons/ui-radios.svg'
+import unlock from 'bootstrap-icons/icons/unlock.svg'
+import upcScan from 'bootstrap-icons/icons/upc-scan.svg'
+import wallet2 from 'bootstrap-icons/icons/wallet2.svg'
+import windowStack from 'bootstrap-icons/icons/window-stack.svg'
+import xCircle from 'bootstrap-icons/icons/x-circle.svg'
+import xLg from 'bootstrap-icons/icons/x-lg.svg'
+import x from 'bootstrap-icons/icons/x.svg'
+
+/**
+ * `<pngx-bs-icon>`. Only icons registered here are bundled but can add
+ * new ones (any icon from the bootstrap-icons package) as needed.
+ */
+export const icons: Record<string, string> = {
+  airplane,
+  archive,
+  arrowClockwise,
+  arrowCounterclockwise,
+  arrowDown,
+  arrowDownUp,
+  arrowLeft,
+  arrowRepeat,
+  arrowReturnLeft,
+  arrowRight,
+  arrowRightShort,
+  arrowUpRight,
+  asterisk,
+  bank,
+  basket,
+  bell,
+  braces,
+  bodyText,
+  bookmark,
+  boxArrowInRight,
+  boxArrowUp,
+  boxArrowUpRight,
+  boxes,
+  briefcase,
+  building,
+  calculator,
+  calendar,
+  calendarEvent,
+  calendarEventFill,
+  camera,
+  cardChecklist,
+  cardHeading,
+  caretDown,
+  caretUp,
+  chatLeftText,
+  chatSquareDots,
+  check,
+  check2All,
+  checkAll,
+  checkCircle,
+  checkCircleFill,
+  checkLg,
+  chevronDoubleLeft,
+  chevronDoubleRight,
+  chevronDown,
+  chevronRight,
+  chevronUp,
+  circle,
+  clipboard,
+  clipboardCheck,
+  clipboardCheckFill,
+  clipboardFill,
+  clockHistory,
+  cpu,
+  cash,
+  creditCard,
+  dash,
+  dashCircle,
+  diagram3,
+  dice5,
+  doorOpen,
+  download,
+  envelope,
+  envelopeAt,
+  envelopeAtFill,
+  exclamationCircleFill,
+  exclamationTriangle,
+  exclamationTriangleFill,
+  eye,
+  fileEarmark,
+  fileEarmarkArrowUp,
+  fileEarmarkCheck,
+  fileEarmarkDiff,
+  fileEarmarkFill,
+  fileEarmarkLock,
+  fileEarmarkMedical,
+  fileEarmarkMinus,
+  fileEarmarkPerson,
+  fileEarmarkPlus,
+  fileEarmarkRichtext,
+  fileEarmarkSpreadsheet,
+  files,
+  fileText,
+  filter,
+  floppy,
+  folder,
+  folderFill,
+  funnel,
+  gear,
+  globe2,
+  google,
+  grid,
+  gripVertical,
+  hash,
+  hddStack,
+  heart,
+  house,
+  inbox,
+  infoCircle,
+  journalBookmarkFill,
+  journals,
+  lightbulb,
+  link,
+  list,
+  listNested,
+  listTask,
+  listUl,
+  microsoft,
+  newspaper,
+  nodePlus,
+  pencil,
+  paperclip,
+  people,
+  peopleFill,
+  person,
+  personCircle,
+  personFill,
+  personFillLock,
+  personLock,
+  personSquare,
+  playFill,
+  plus,
+  plusCircle,
+  printer,
+  questionCircle,
+  receipt,
+  safe,
+  scissors,
+  search,
+  send,
+  slashCircle,
+  shop,
+  sliders2Vertical,
+  sortAlphaDown,
+  sortAlphaUpAlt,
+  stack,
+  stars,
+  tagFill,
+  tag,
+  tags,
+  textIndentLeft,
+  textLeft,
+  telephone,
+  threeDots,
+  threeDotsVertical,
+  trash,
+  truck,
+  uiRadios,
+  unlock,
+  upcScan,
+  wallet2,
+  windowStack,
+  x,
+  xCircle,
+  xLg,
+}

src-ui/src/app/components/common/clearable-badge/clearable-badge.component.html

@@ -1,11 +1,11 @@
 @if (active()) {
   <button class="position-absolute top-0 start-100 translate-middle badge bg-secondary border border-light rounded-pill p-1" title="Clear" i18n-title (click)="onClick($event)">
     @if (!isNumbered() && selected()) {
-      <i-bs class="check" width="1em" height="1em" name="check-lg"></i-bs>
+      <pngx-bs-icon class="check" width="1em" height="1em" name="check-lg"></pngx-bs-icon>
     }
     @if (isNumbered()) {
       <div class="number">{{number()}}<span class="visually-hidden">selected</span></div>
     }
-    <i-bs class="x" width=".9em" height="1em" name="x-lg"></i-bs>
+    <pngx-bs-icon class="x" width=".9em" height="1em" name="x-lg"></pngx-bs-icon>
   </button>
 }

src-ui/src/app/components/common/clearable-badge/clearable-badge.component.spec.ts

@@ -1,5 +1,4 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { ClearableBadgeComponent } from './clearable-badge.component'
 
 describe('ClearableBadgeComponent', () => {
@@ -8,10 +7,7 @@ describe('ClearableBadgeComponent', () => {
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
-      imports: [
-        NgxBootstrapIconsModule.pick(allIcons),
-        ClearableBadgeComponent,
-      ],
+      imports: [ClearableBadgeComponent],
     }).compileComponents()
 
     fixture = TestBed.createComponent(ClearableBadgeComponent)

src-ui/src/app/components/common/clearable-badge/clearable-badge.component.ts

@@ -1,11 +1,11 @@
 import { Component, computed, EventEmitter, input, Output } from '@angular/core'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 
 @Component({
   selector: 'pngx-clearable-badge',
   templateUrl: './clearable-badge.component.html',
   styleUrls: ['./clearable-badge.component.scss'],
-  imports: [NgxBootstrapIconsModule],
+  imports: [BootstrapIconComponent],
 })
 export class ClearableBadgeComponent {
   readonly number = input<number>(undefined)

src-ui/src/app/components/common/confirm-button/confirm-button.component.html

@@ -10,7 +10,7 @@
     popoverClass="popover-slim"
 >
     @if (iconName) {
-        <i-bs [class.me-1]="label" name="{{iconName}}"></i-bs>
+        <pngx-bs-icon [class.me-1]="label" name="{{iconName}}"></pngx-bs-icon>
     }
     <ng-container>{{label}}</ng-container>
 </button>

src-ui/src/app/components/common/confirm-button/confirm-button.component.spec.ts

@@ -1,7 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 
 import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { ConfirmButtonComponent } from './confirm-button.component'
 
 describe('ConfirmButtonComponent', () => {
@@ -10,11 +9,7 @@ describe('ConfirmButtonComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [
-        NgbPopoverModule,
-        NgxBootstrapIconsModule.pick(allIcons),
-        ConfirmButtonComponent,
-      ],
+      imports: [NgbPopoverModule, ConfirmButtonComponent],
     }).compileComponents()
 
     fixture = TestBed.createComponent(ConfirmButtonComponent)

src-ui/src/app/components/common/confirm-button/confirm-button.component.ts

@@ -6,13 +6,13 @@ import {
   ViewChild,
 } from '@angular/core'
 import { NgbPopover, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 
 @Component({
   selector: 'pngx-confirm-button',
   templateUrl: './confirm-button.component.html',
   styleUrl: './confirm-button.component.scss',
-  imports: [NgbPopoverModule, NgxBootstrapIconsModule],
+  imports: [NgbPopoverModule, BootstrapIconComponent],
 })
 export class ConfirmButtonComponent {
   @Input()

src-ui/src/app/components/common/confirm-dialog/merge-as-versions-confirm-dialog/merge-as-versions-confirm-dialog.component.html

@@ -22,7 +22,7 @@
         @let document = getDocument(documentID);
         @if (document) {
           <li class="list-group-item d-flex align-items-center" cdkDrag>
-            <i-bs name="grip-vertical" class="me-2"></i-bs>
+            <pngx-bs-icon name="grip-vertical" class="me-2"></pngx-bs-icon>
             <div class="d-flex flex-column">
               <div>
                 @if (document.correspondent) {

src-ui/src/app/components/common/confirm-dialog/merge-as-versions-confirm-dialog/merge-as-versions-confirm-dialog.component.spec.ts

@@ -2,7 +2,6 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { of } from 'rxjs'
 import { DocumentService } from 'src/app/services/rest/document.service'
 import { MergeAsVersionsConfirmDialogComponent } from './merge-as-versions-confirm-dialog.component'
@@ -14,10 +13,7 @@ describe('MergeAsVersionsConfirmDialogComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [
-        NgxBootstrapIconsModule.pick(allIcons),
-        MergeAsVersionsConfirmDialogComponent,
-      ],
+      imports: [MergeAsVersionsConfirmDialogComponent],
       providers: [
         NgbActiveModal,
         provideHttpClient(withInterceptorsFromDi()),

src-ui/src/app/components/common/confirm-dialog/merge-as-versions-confirm-dialog/merge-as-versions-confirm-dialog.component.ts

@@ -6,8 +6,8 @@ import {
 import { AsyncPipe } from '@angular/common'
 import { Component, OnInit, computed, inject, signal } from '@angular/core'
 import { FormsModule } from '@angular/forms'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { takeUntil } from 'rxjs'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { Document } from 'src/app/data/document'
 import { CorrespondentNamePipe } from 'src/app/pipes/correspondent-name.pipe'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
@@ -24,7 +24,7 @@ import { ConfirmDialogComponent } from '../confirm-dialog.component'
     CustomDatePipe,
     DragDropModule,
     FormsModule,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
   ],
 })
 export class MergeAsVersionsConfirmDialogComponent

src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.html

@@ -15,7 +15,7 @@
               @let document = getDocument(documentID);
               @if (document) {
                 <li class="list-group-item d-flex align-items-center" cdkDrag>
-                    <i-bs name="grip-vertical" class="me-2"></i-bs>
+                    <pngx-bs-icon name="grip-vertical" class="me-2"></pngx-bs-icon>
                     <div class="d-flex flex-column">
                         <div>
                           @if (document.correspondent) {

src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.spec.ts

@@ -3,7 +3,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { of } from 'rxjs'
 import { DocumentService } from 'src/app/services/rest/document.service'
 import { MergeConfirmDialogComponent } from './merge-confirm-dialog.component'
@@ -15,12 +14,7 @@ describe('MergeConfirmDialogComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [
-        NgxBootstrapIconsModule.pick(allIcons),
-        ReactiveFormsModule,
-        FormsModule,
-        MergeConfirmDialogComponent,
-      ],
+      imports: [ReactiveFormsModule, FormsModule, MergeConfirmDialogComponent],
       providers: [
         NgbActiveModal,
         provideHttpClient(withInterceptorsFromDi()),

src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.ts

@@ -6,8 +6,8 @@ import {
 import { AsyncPipe } from '@angular/common'
 import { Component, OnInit, inject, signal } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { takeUntil } from 'rxjs'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { Document } from 'src/app/data/document'
 import { CorrespondentNamePipe } from 'src/app/pipes/correspondent-name.pipe'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
@@ -26,7 +26,7 @@ import { ConfirmDialogComponent } from '../confirm-dialog.component'
     DragDropModule,
     FormsModule,
     ReactiveFormsModule,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
   ],
 })
 export class MergeConfirmDialogComponent

src-ui/src/app/components/common/confirm-dialog/password-removal-confirm-dialog/password-removal-confirm-dialog.component.html

@@ -18,7 +18,7 @@
       (ngModelChange)="onUpdateDocumentChange($event)"
     />
     <label class="btn btn-outline-primary btn-sm" for="removeReplace">
-      <i-bs name="pencil"></i-bs>
+      <pngx-bs-icon name="pencil"></pngx-bs-icon>
       <span class="ms-2" i18n>Replace current document</span>
     </label>
     <input
@@ -31,7 +31,7 @@
       (ngModelChange)="onUpdateDocumentChange($event)"
     />
     <label class="btn btn-outline-primary btn-sm" for="removeCreate">
-      <i-bs name="plus"></i-bs>
+      <pngx-bs-icon name="plus"></pngx-bs-icon>
       <span class="ms-2" i18n>Create new document</span>
     </label>
   </div>

src-ui/src/app/components/common/confirm-dialog/password-removal-confirm-dialog/password-removal-confirm-dialog.component.spec.ts

@@ -1,7 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { By } from '@angular/platform-browser'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { PasswordRemovalConfirmDialogComponent } from './password-removal-confirm-dialog.component'
 
 describe('PasswordRemovalConfirmDialogComponent', () => {
@@ -11,10 +10,7 @@ describe('PasswordRemovalConfirmDialogComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       providers: [NgbActiveModal],
-      imports: [
-        NgxBootstrapIconsModule.pick(allIcons),
-        PasswordRemovalConfirmDialogComponent,
-      ],
+      imports: [PasswordRemovalConfirmDialogComponent],
     }).compileComponents()
 
     fixture = TestBed.createComponent(PasswordRemovalConfirmDialogComponent)

src-ui/src/app/components/common/confirm-dialog/password-removal-confirm-dialog/password-removal-confirm-dialog.component.ts

@@ -1,13 +1,13 @@
 import { Component } from '@angular/core'
 import { FormsModule } from '@angular/forms'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { ConfirmDialogComponent } from '../confirm-dialog.component'
 
 @Component({
   selector: 'pngx-password-removal-confirm-dialog',
   templateUrl: './password-removal-confirm-dialog.component.html',
   styleUrls: ['./password-removal-confirm-dialog.component.scss'],
-  imports: [FormsModule, NgxBootstrapIconsModule],
+  imports: [FormsModule, BootstrapIconComponent],
 })
 export class PasswordRemovalConfirmDialogComponent extends ConfirmDialogComponent {
   updateDocument: boolean = true

src-ui/src/app/components/common/confirm-dialog/rotate-confirm-dialog/rotate-confirm-dialog.component.html

@@ -7,7 +7,7 @@
     <div class="row">
         <div class="col-2 d-flex justify-content-end">
             <button class="btn btn-secondary mt-auto" (click)="rotate(false)" aria-label="Rotate counterclockwise" i18n-aria-label>
-                <i-bs name="arrow-counterclockwise"></i-bs>
+                <pngx-bs-icon name="arrow-counterclockwise"></pngx-bs-icon>
             </button>
         </div>
         <div class="col-8 d-flex align-items-center">
@@ -17,7 +17,7 @@
         </div>
         <div class="col-2 d-flex">
             <button class="btn btn-secondary mt-auto" (click)="rotate()" aria-label="Rotate clockwise" i18n-aria-label>
-                <i-bs name="arrow-clockwise"></i-bs>
+                <pngx-bs-icon name="arrow-clockwise"></pngx-bs-icon>
             </button>
         </div>
     </div>

src-ui/src/app/components/common/confirm-dialog/rotate-confirm-dialog/rotate-confirm-dialog.component.spec.ts

@@ -2,7 +2,6 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { RotateConfirmDialogComponent } from './rotate-confirm-dialog.component'
 
 describe('RotateConfirmDialogComponent', () => {
@@ -11,10 +10,7 @@ describe('RotateConfirmDialogComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [
-        NgxBootstrapIconsModule.pick(allIcons),
-        RotateConfirmDialogComponent,
-      ],
+      imports: [RotateConfirmDialogComponent],
       providers: [
         NgbActiveModal,
         provideHttpClient(withInterceptorsFromDi()),

src-ui/src/app/components/common/confirm-dialog/rotate-confirm-dialog/rotate-confirm-dialog.component.ts

@@ -1,6 +1,6 @@
 import { NgStyle } from '@angular/common'
 import { Component, inject, signal } from '@angular/core'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { DocumentService } from 'src/app/services/rest/document.service'
 import { ConfirmDialogComponent } from '../confirm-dialog.component'
 
@@ -8,7 +8,7 @@ import { ConfirmDialogComponent } from '../confirm-dialog.component'
   selector: 'pngx-rotate-confirm-dialog',
   templateUrl: './rotate-confirm-dialog.component.html',
   styleUrl: './rotate-confirm-dialog.component.scss',
-  imports: [NgStyle, NgxBootstrapIconsModule],
+  imports: [NgStyle, BootstrapIconComponent],
 })
 export class RotateConfirmDialogComponent extends ConfirmDialogComponent {
   documentService = inject(DocumentService)

src-ui/src/app/components/common/custom-field-display/custom-field-display.component.html

@@ -20,7 +20,7 @@
                     @for (docId of value; track docId) {
                       @if (getDocumentTitle(docId)) {
                           <a routerLink="/documents/{{docId}}" class="badge bg-body text-primary" title="View" i18n-title>
-                              <i-bs width="0.9em" height="0.9em" name="file-text" class="me-1"></i-bs><span>{{ getDocumentTitle(docId) }}</span>
+                              <pngx-bs-icon width="0.9em" height="0.9em" name="file-text" class="me-1"></pngx-bs-icon><span>{{ getDocumentTitle(docId) }}</span>
                           </a>
                       }
                     }

src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.html

@@ -1,6 +1,6 @@
 <div ngbDropdown #fieldDropdown="ngbDropdown" (openChange)="onOpenClose($event)" [popperOptions]="popperOptions">
     <button type="button" class="btn btn-sm btn-outline-primary" id="customFieldsDropdown" [disabled]="disabled" ngbDropdownToggle aria-label="Custom Fields" i18n-aria-label>
-      <i-bs name="ui-radios"></i-bs><div class="d-none d-lg-inline ms-1"><ng-container i18n>Custom Fields</ng-container></div>
+      <pngx-bs-icon name="ui-radios"></pngx-bs-icon><div class="d-none d-lg-inline ms-1"><ng-container i18n>Custom Fields</ng-container></div>
     </button>
     <div ngbDropdownMenu aria-labelledby="customFieldsDropdown" class="shadow custom-fields-dropdown">
         <div class="list-group list-group-flush" (keydown)="listKeyDown($event)">
@@ -16,7 +16,7 @@
             }
             @if (!filterText?.length || filteredFields.length === 0) {
                 <button type="button" class="list-group-item list-group-item-action bg-light" (click)="createField(filterText)" [disabled]="!canCreateFields" #button>
-                    <i-bs width=".9em" height=".9em" name="asterisk" class="me-1"></i-bs><ng-container i18n>Create new field</ng-container>
+                    <pngx-bs-icon width=".9em" height=".9em" name="asterisk" class="me-1"></pngx-bs-icon><ng-container i18n>Create new field</ng-container>
                 </button>
             }
         </div>

src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.spec.ts

@@ -10,7 +10,6 @@ import {
   NgbModalRef,
 } from '@ng-bootstrap/ng-bootstrap'
 import { NgSelectModule } from '@ng-select/ng-select'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { of } from 'rxjs'
 import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field'
 import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
@@ -49,7 +48,6 @@ describe('CustomFieldsDropdownComponent', () => {
         ReactiveFormsModule,
         NgbModalModule,
         NgbDropdownModule,
-        NgxBootstrapIconsModule.pick(allIcons),
         CustomFieldsDropdownComponent,
         SelectComponent,
       ],

src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.ts

@@ -12,8 +12,8 @@ import {
 } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbDropdownModule, NgbModal } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { first, takeUntil } from 'rxjs'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { CustomField, DATA_TYPE_LABELS } from 'src/app/data/custom-field'
 import { CustomFieldInstance } from 'src/app/data/custom-field-instance'
 import {
@@ -34,7 +34,7 @@ import { CustomFieldEditDialogComponent } from '../edit-dialog/custom-field-edit
   styleUrls: ['./custom-fields-dropdown.component.scss'],
   imports: [
     NgbDropdownModule,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
     FormsModule,
     ReactiveFormsModule,
   ],

src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html

@@ -1,7 +1,7 @@
 @if (useDropdown) {
   <div class="btn-group w-100" role="group" ngbDropdown #dropdown="ngbDropdown" (openChange)="onOpenChange($event)" [popperOptions]="popperOptions">
     <button class="btn btn-sm" [ngClass]="!editing && isActive ? 'btn-primary' : 'btn-outline-primary'" id="dropdown_toggle" ngbDropdownToggle [disabled]="disabled" [aria-label]="title">
-      <i-bs name="{{icon}}"></i-bs><div class="d-none d-sm-inline ms-1">{{title}}</div>
+      <pngx-bs-icon name="{{icon}}"></pngx-bs-icon><div class="d-none d-sm-inline ms-1">{{title}}</div>
       @if (isActive) {
         <pngx-clearable-badge [selected]="isActive" (cleared)="reset()"></pngx-clearable-badge>
       }
@@ -38,11 +38,11 @@
       <fieldset class="btn-group btn-group-sm flex-shrink-0 date-mode" aria-label="Date mode" i18n-aria-label>
         <input type="radio" class="btn-check" [id]="atom.id + '_fixed'" [name]="atom.id + '_dateMode'" [checked]="!relativeDate" (change)="toggleRelativeDate(atom)" [disabled]="disabled" aria-label="Fixed date" i18n-aria-label>
         <label class="btn btn-outline-secondary text-nowrap" [for]="atom.id + '_fixed'" title="Fixed date" i18n-title>
-          <i-bs name="calendar"></i-bs><span class="d-none d-md-inline ms-2" i18n>Fixed</span>
+          <pngx-bs-icon name="calendar"></pngx-bs-icon><span class="d-none d-md-inline ms-2" i18n>Fixed</span>
         </label>
         <input type="radio" class="btn-check" [id]="atom.id + '_relative'" [name]="atom.id + '_dateMode'" [checked]="!!relativeDate" (change)="toggleRelativeDate(atom)" [disabled]="disabled" aria-label="Relative date" i18n-aria-label>
         <label class="btn btn-outline-secondary text-nowrap" [for]="atom.id + '_relative'" title="Relative date" i18n-title>
-          <i-bs name="clock-history"></i-bs><span class="d-none d-md-inline ms-2" i18n>Relative</span>
+          <pngx-bs-icon name="clock-history"></pngx-bs-icon><span class="d-none d-md-inline ms-2" i18n>Relative</span>
         </label>
       </fieldset>
       <div class="input-group input-group-sm flex-grow-1">
@@ -70,7 +70,7 @@
             #d="ngbDatepicker"
             [footerTemplate]="datePickerFooterTemplate" />
           <button class="btn btn-sm btn-outline-secondary" (click)="d.toggle()" type="button" aria-label="Open date picker" i18n-aria-label>
-            <i-bs name="calendar-event"></i-bs>
+            <pngx-bs-icon name="calendar-event"></pngx-bs-icon>
           </button>
           <ng-template #datePickerFooterTemplate>
             <div class="btn-group-xs border-top p-2 d-flex">
@@ -187,7 +187,7 @@
     }
   </div>
   <button class="btn btn-link btn-sm text-danger pe-0 align-self-center" type="button" (click)="removeElement(atom)" [disabled]="disabled" aria-label="Remove query" i18n-aria-label>
-    <i-bs name="x-circle"></i-bs>
+    <pngx-bs-icon name="x-circle"></pngx-bs-icon>
   </button>
 </ng-template>
 
@@ -221,14 +221,14 @@
     </div>
     <div class="btn-group-vertical ms-2 ps-2 border-start" role="group" aria-label="Vertical button group">
       <button type="button" class="btn btn-sm btn-outline-secondary text-primary" title="Add query" i18n-title (click)="addAtom(expression)" [disabled]="disabled || expression.value.length === CUSTOM_FIELD_QUERY_MAX_ATOMS">
-        <i-bs name="node-plus"></i-bs>
+        <pngx-bs-icon name="node-plus"></pngx-bs-icon>
       </button>
       <button type="button" class="btn btn-sm btn-outline-secondary text-primary" title="Add expression" i18n-title (click)="addExpression(expression)" [disabled]="disabled || expression.depth === CUSTOM_FIELD_QUERY_MAX_DEPTH">
-        <i-bs name="braces"></i-bs>
+        <pngx-bs-icon name="braces"></pngx-bs-icon>
       </button>
       @if (expression.depth > 0) {
         <button type="button" class="btn btn-sm btn-outline-secondary text-danger" (click)="removeElement(expression)" [disabled]="disabled" aria-label="Remove expression" i18n-aria-label>
-          <i-bs name="x-circle"></i-bs>
+          <pngx-bs-icon name="x-circle"></pngx-bs-icon>
         </button>
       }
     </div>

src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.spec.ts

@@ -5,7 +5,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbDateAdapter, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgSelectModule } from '@ng-select/ng-select'
-import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { of } from 'rxjs'
 import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field'
 import {
@@ -67,7 +66,6 @@ describe('CustomFieldsQueryDropdownComponent', () => {
     await TestBed.configureTestingModule({
       imports: [
         NgbDropdownModule,
-        NgxBootstrapIconsModule.pick(allIcons),
         NgSelectModule,
         FormsModule,
         ReactiveFormsModule,

src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.ts

@@ -24,8 +24,8 @@ import {
   NgbDropdownModule,
 } from '@ng-bootstrap/ng-bootstrap'
 import { NgSelectComponent, NgSelectModule } from '@ng-select/ng-select'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { first, Subject, Subscription, takeUntil } from 'rxjs'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field'
 import {
   CUSTOM_FIELD_QUERY_MAX_ATOMS,
@@ -235,7 +235,7 @@ export class CustomFieldQueriesModel {
     NgClass,
     NgTemplateOutlet,
     NgSelectModule,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
     NgbDropdownModule,
   ],
 })

src-ui/src/app/components/common/dates-dropdown/dates-dropdown.component.html

@@ -1,6 +1,6 @@
 <div class="btn-group w-100" ngbDropdown role="group" [popperOptions]="popperOptions" [placement]="placement">
   <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="createdDateTo || createdDateFrom ? 'btn-primary' : 'btn-outline-primary'" [disabled]="disabled" [aria-label]="title">
-    <i-bs width="1em" height="1em" name="calendar-event-fill"></i-bs><div class="d-none d-sm-inline ms-1">{{title}}</div>
+    <pngx-bs-icon width="1em" height="1em" name="calendar-event-fill"></pngx-bs-icon><div class="d-none d-sm-inline ms-1">{{title}}</div>
     <pngx-clearable-badge [selected]="isActive" (cleared)="reset()"></pngx-clearable-badge><span class="visually-hidden">selected</span>
   </button>
   <div [id]="dropdownMenuId" class="dropdown-menu date-dropdown shadow p-2" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
@@ -10,8 +10,8 @@
         <div class="selected-icon">
           @if (createdRelativeDate) {
             <a class="text-light focus-variants" href="javascript:void(0)" (click)="clearCreatedRelativeDate()" aria-label="Clear created relative date" i18n-aria-label>
-              <i-bs width="1em" height="1em" name="check" class="variant-unfocused text-dark"></i-bs>
-              <i-bs width="1em" height="1em" name="x" class="variant-focused text-primary"></i-bs>
+              <pngx-bs-icon width="1em" height="1em" name="check" class="variant-unfocused text-dark"></pngx-bs-icon>
+              <pngx-bs-icon width="1em" height="1em" name="x" class="variant-focused text-primary"></pngx-bs-icon>
             </a>
           }
         </div>
@@ -35,8 +35,8 @@
         <div class="selected-icon">
           @if (createdDateFrom) {
             <a class="text-light focus-variants" href="javascript:void(0)" (click)="clearCreatedFrom()" aria-label="Clear created from date" i18n-aria-label>
-              <i-bs width="1em" height="1em" name="check" class="variant-unfocused"></i-bs>
-              <i-bs width="1em" height="1em" name="x" class="variant-focused text-primary"></i-bs>
+              <pngx-bs-icon width="1em" height="1em" name="check" class="variant-unfocused"></pngx-bs-icon>
+              <pngx-bs-icon width="1em" height="1em" name="x" class="variant-focused text-primary"></pngx-bs-icon>
             </a>
           }
         </div>
@@ -45,7 +45,7 @@
           <input class="form-control small" [placeholder]="datePlaceHolder" (dateSelect)="onChangeDebounce()" (change)="onChangeDebounce()" (keypress)="onKeyPress($event)"
             maxlength="10" [(ngModel)]="createdDateFrom" ngbDatepicker #createdDateFromPicker="ngbDatepicker" [footerTemplate]="createdFromFooterTemplate">
           <button class="btn btn-outline-secondary" (click)="createdDateFromPicker.toggle()" type="button" aria-label="Open created from date picker" i18n-aria-label>
-            <i-bs width="1em" height="1em" name="calendar"></i-bs>
+            <pngx-bs-icon width="1em" height="1em" name="calendar"></pngx-bs-icon>
           </button>
           <ng-template #createdFromFooterTemplate>
             <div class="btn-group-xs border-top p-2 d-flex">
@@ -59,8 +59,8 @@
         <div class="selected-icon">
           @if (createdDateTo) {
             <a class="text-light focus-variants" href="javascript:void(0)" (click)="clearCreatedTo()" aria-label="Clear created to date" i18n-aria-label>
-              <i-bs width="1em" height="1em" name="check" class="variant-unfocused"></i-bs>
-              <i-bs width="1em" height="1em" name="x" class="variant-focused text-primary"></i-bs>
+              <pngx-bs-icon width="1em" height="1em" name="check" class="variant-unfocused"></pngx-bs-icon>
+              <pngx-bs-icon width="1em" height="1em" name="x" class="variant-focused text-primary"></pngx-bs-icon>
             </a>
           }
         </div>
@@ -69,7 +69,7 @@
           <input class="form-control small" [placeholder]="datePlaceHolder" (dateSelect)="onChangeDebounce()" (change)="onChangeDebounce()" (keypress)="onKeyPress($event)"
             maxlength="10" [(ngModel)]="createdDateTo" ngbDatepicker #createdDateToPicker="ngbDatepicker" [footerTemplate]="createdToFooterTemplate">
           <button class="btn btn-outline-secondary" (click)="createdDateToPicker.toggle()" type="button" aria-label="Open created to date picker" i18n-aria-label>
-            <i-bs width="1em" height="1em" name="calendar"></i-bs>
+            <pngx-bs-icon width="1em" height="1em" name="calendar"></pngx-bs-icon>
           </button>
           <ng-template #createdToFooterTemplate>
             <div class="btn-group-xs border-top p-2 d-flex">
@@ -87,8 +87,8 @@
         <div class="selected-icon">
           @if (addedRelativeDate) {
             <a class="text-light focus-variants" href="javascript:void(0)" (click)="clearAddedRelativeDate()" aria-label="Clear added relative date" i18n-aria-label>
-              <i-bs width="1em" height="1em" name="check" class="variant-unfocused text-dark"></i-bs>
-              <i-bs width="1em" height="1em" name="x" class="variant-focused text-primary"></i-bs>
+              <pngx-bs-icon width="1em" height="1em" name="check" class="variant-unfocused text-dark"></pngx-bs-icon>
+              <pngx-bs-icon width="1em" height="1em" name="x" class="variant-focused text-primary"></pngx-bs-icon>
             </a>
           }
         </div>
@@ -112,8 +112,8 @@
         <div class="selected-icon">
           @if (addedDateFrom) {
             <a class="text-light focus-variants" href="javascript:void(0)" (click)="clearAddedFrom()" aria-label="Clear added from date" i18n-aria-label>
-              <i-bs width="1em" height="1em" name="check" class="variant-unfocused"></i-bs>
-              <i-bs width="1em" height="1em" name="x" class="variant-focused text-primary"></i-bs>
+              <pngx-bs-icon width="1em" height="1em" name="check" class="variant-unfocused"></pngx-bs-icon>
+              <pngx-bs-icon width="1em" height="1em" name="x" class="variant-focused text-primary"></pngx-bs-icon>
             </a>
           }
         </div>
@@ -122,7 +122,7 @@
           <input class="form-control small" [placeholder]="datePlaceHolder" (dateSelect)="onChangeDebounce()" (change)="onChangeDebounce()" (keypress)="onKeyPress($event)"
             maxlength="10" [(ngModel)]="addedDateFrom" ngbDatepicker #addedDateFromPicker="ngbDatepicker" [footerTemplate]="addedFromFooterTemplate">
           <button class="btn btn-outline-secondary" (click)="addedDateFromPicker.toggle()" type="button" aria-label="Open added from date picker" i18n-aria-label>
-            <i-bs width="1em" height="1em" name="calendar"></i-bs>
+            <pngx-bs-icon width="1em" height="1em" name="calendar"></pngx-bs-icon>
           </button>
           <ng-template #addedFromFooterTemplate>
             <div class="btn-group-xs border-top p-2 d-flex">
@@ -136,8 +136,8 @@
         <div class="selected-icon">
           @if (addedDateTo) {
             <a class="text-light focus-variants" href="javascript:void(0)" (click)="clearAddedTo()" aria-label="Clear added to date" i18n-aria-label>
-              <i-bs width="1em" height="1em" name="check" class="variant-unfocused"></i-bs>
-              <i-bs width="1em" height="1em" name="x" class="variant-focused text-primary"></i-bs>
+              <pngx-bs-icon width="1em" height="1em" name="check" class="variant-unfocused"></pngx-bs-icon>
+              <pngx-bs-icon width="1em" height="1em" name="x" class="variant-focused text-primary"></pngx-bs-icon>
             </a>
           }
         </div>
@@ -146,7 +146,7 @@
           <input class="form-control small" [placeholder]="datePlaceHolder" (dateSelect)="onChangeDebounce()" (change)="onChangeDebounce()" (keypress)="onKeyPress($event)"
             maxlength="10" [(ngModel)]="addedDateTo" ngbDatepicker #addedDateToPicker="ngbDatepicker" [footerTemplate]="addedToFooterTemplate">
           <button class="btn btn-outline-secondary" (click)="addedDateToPicker.toggle()" type="button" aria-label="Open added to date picker" i18n-aria-label>
-            <i-bs width="1em" height="1em" name="calendar"></i-bs>
+            <pngx-bs-icon width="1em" height="1em" name="calendar"></pngx-bs-icon>
           </button>
           <ng-template #addedToFooterTemplate>
             <div class="btn-group-xs border-top p-2 d-flex">

src-ui/src/app/components/common/dates-dropdown/dates-dropdown.component.spec.ts

@@ -4,7 +4,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
 import { SettingsService } from 'src/app/services/settings.service'
 import { ClearableBadgeComponent } from '../clearable-badge/clearable-badge.component'
@@ -26,7 +25,6 @@ describe('DatesDropdownComponent', () => {
         NgbModule,
         FormsModule,
         ReactiveFormsModule,
-        NgxBootstrapIconsModule.pick(allIcons),
         DatesDropdownComponent,
         ClearableBadgeComponent,
         CustomDatePipe,

src-ui/src/app/components/common/dates-dropdown/dates-dropdown.component.ts

@@ -1,3 +1,4 @@
+import { _IdGenerator } from '@angular/cdk/a11y'
 import { NgClass, NgTemplateOutlet } from '@angular/common'
 import {
   Component,
@@ -15,15 +16,14 @@ import {
   NgbDropdownModule,
 } from '@ng-bootstrap/ng-bootstrap'
 import { NgSelectModule } from '@ng-select/ng-select'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { Subject, Subscription } from 'rxjs'
 import { debounceTime } from 'rxjs/operators'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
 import { SettingsService } from 'src/app/services/settings.service'
 import { ISODateAdapter } from 'src/app/utils/ngb-iso-date-adapter'
 import { pngxPopperOptions } from 'src/app/utils/popper-options'
 import { ClearableBadgeComponent } from '../clearable-badge/clearable-badge.component'
-import { _IdGenerator } from '@angular/cdk/a11y'
 
 export interface DateSelection {
   createdTo?: string
@@ -57,7 +57,7 @@ export enum RelativeDate {
   imports: [
     ClearableBadgeComponent,
     CustomDatePipe,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
     NgbDatepickerModule,
     NgbDropdownModule,
     NgSelectModule,

src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.html

@@ -17,7 +17,7 @@
       @switch (objectForm.get('data_type').value) {
         @case (CustomFieldDataType.Select) {
           <button type="button" class="btn btn-sm btn-primary my-2" (click)="addSelectOption()">
-            <span i18n>Add option</span><i-bs class="ms-1" name="plus-circle"></i-bs>
+            <span i18n>Add option</span><pngx-bs-icon class="ms-1" name="plus-circle"></pngx-bs-icon>
           </button>
           <div formArrayName="select_options">
             @for (option of objectForm.controls.extra_data.controls.select_options.controls; track option; let i = $index) {

src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.spec.ts

@@ -6,7 +6,6 @@ import { ElementRef, QueryList } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbActiveModal, NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgSelectModule } from '@ng-select/ng-select'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { CustomFieldDataType } from 'src/app/data/custom-field'
 import { IfOwnerDirective } from 'src/app/directives/if-owner.directive'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
@@ -28,7 +27,6 @@ describe('CustomFieldEditDialogComponent', () => {
         ReactiveFormsModule,
         NgSelectModule,
         NgbModule,
-        NgxBootstrapIconsModule.pick(allIcons),
         CustomFieldEditDialogComponent,
         IfPermissionsDirective,
         IfOwnerDirective,

src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.ts

@@ -15,8 +15,8 @@ import {
   ReactiveFormsModule,
 } from '@angular/forms'
 import { NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { takeUntil } from 'rxjs'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import {
   CustomField,
   CustomFieldDataType,
@@ -41,7 +41,7 @@ const SELECT_OPTION_PAGE_SIZE = 8
     FormsModule,
     ReactiveFormsModule,
     NgbPaginationModule,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
   ],
 })
 export class CustomFieldEditDialogComponent

src-ui/src/app/components/common/edit-dialog/group-edit-dialog/group-edit-dialog.component.spec.ts

@@ -4,7 +4,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbActiveModal, NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgSelectModule } from '@ng-select/ng-select'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { IfOwnerDirective } from 'src/app/directives/if-owner.directive'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { SettingsService } from 'src/app/services/settings.service'
@@ -27,7 +26,6 @@ describe('GroupEditDialogComponent', () => {
         ReactiveFormsModule,
         NgSelectModule,
         NgbModule,
-        NgxBootstrapIconsModule.pick(allIcons),
         GroupEditDialogComponent,
         IfPermissionsDirective,
         IfOwnerDirective,

src-ui/src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.spec.ts

@@ -4,7 +4,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbActiveModal, NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgSelectModule } from '@ng-select/ng-select'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { IfOwnerDirective } from 'src/app/directives/if-owner.directive'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { SettingsService } from 'src/app/services/settings.service'
@@ -28,7 +27,6 @@ describe('TagEditDialogComponent', () => {
         ReactiveFormsModule,
         NgSelectModule,
         NgbModule,
-        NgxBootstrapIconsModule.pick(allIcons),
         TagEditDialogComponent,
         IfPermissionsDirective,
         IfOwnerDirective,

src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.spec.ts

@@ -8,7 +8,6 @@ import {
 } from '@angular/forms'
 import { NgbActiveModal, NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgSelectModule } from '@ng-select/ng-select'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { of, throwError } from 'rxjs'
 import { IfOwnerDirective } from 'src/app/directives/if-owner.directive'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
@@ -39,7 +38,6 @@ describe('UserEditDialogComponent', () => {
         ReactiveFormsModule,
         NgSelectModule,
         NgbModule,
-        NgxBootstrapIconsModule.pick(allIcons),
         UserEditDialogComponent,
         IfPermissionsDirective,
         IfOwnerDirective,

src-ui/src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html

@@ -30,7 +30,7 @@
               <div class="d-flex">
                 <p class="p-2" i18n>Trigger Workflow On:</p>
                 <button type="button" class="btn btn-sm btn-outline-primary ms-auto mb-3" (click)="addTrigger()">
-                  <i-bs name="plus-circle" class="me-1"></i-bs><ng-container i18n>Add Trigger</ng-container>
+                  <pngx-bs-icon name="plus-circle" class="me-1"></pngx-bs-icon><ng-container i18n>Add Trigger</ng-container>
                 </button>
               </div>
               <div ngbAccordion [closeOthers]="true">
@@ -72,7 +72,7 @@
               <div class="d-flex">
                 <p class="p-2" i18n>Apply Actions:</p>
                 <button type="button" class="btn btn-sm btn-outline-primary ms-auto mb-3" (click)="addAction()">
-                  <i-bs name="plus-circle" class="me-1"></i-bs><ng-container i18n>Add Action</ng-container>
+                  <pngx-bs-icon name="plus-circle" class="me-1"></pngx-bs-icon><ng-container i18n>Add Action</ng-container>
                 </button>
               </div>
               <div ngbAccordion [closeOthers]="true" cdkDropList (cdkDropListDropped)="onActionDrop($event)">
@@ -80,7 +80,7 @@
                   <div ngbAccordionItem [formGroup]="actionFields.controls[i]">
                     <div ngbAccordionHeader cdkDrag>
                       <button ngbAccordionButton>
-                        <i-bs name="grip-vertical" class="ms-n3 pe-1"></i-bs>
+                        <pngx-bs-icon name="grip-vertical" class="ms-n3 pe-1"></pngx-bs-icon>
                         {{i + 1}}. {{getActionTypeOptionName(actionFields.controls[i].value.type)}}
                         @if(action.id) {
                           <span class="badge bg-primary text-primary-text-contrast ms-2">ID: {{action.id}}</span>
@@ -187,7 +187,7 @@
                 (click)="addFilter(formGroup)"
                 [disabled]="!canAddFilter(formGroup)"
               >
-                <i-bs name="plus-circle" class="me-1"></i-bs><span i18n>Add filter</span>
+                <pngx-bs-icon name="plus-circle" class="me-1"></pngx-bs-icon><span i18n>Add filter</span>
               </button>
             </div>
             <ul class="mt-2 list-group filters" formArrayName="filters">
@@ -240,7 +240,7 @@
                       class="btn btn-link text-danger p-0"
                       (click)="removeFilter(formGroup, filterIndex)"
                     >
-                      <i-bs name="trash"></i-bs><span class="ms-1" i18n>Delete</span>
+                      <pngx-bs-icon name="trash"></pngx-bs-icon><span class="ms-1" i18n>Delete</span>
                     </button>
                   </div>
                 </li>

src-ui/src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts

@@ -15,8 +15,8 @@ import {
   ReactiveFormsModule,
 } from '@angular/forms'
 import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { Subscription, catchError, map, of, takeUntil } from 'rxjs'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { Correspondent } from 'src/app/data/correspondent'
 import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field'
 import { DocumentType } from 'src/app/data/document-type'
@@ -496,7 +496,7 @@ const FILTER_HANDLERS: Record<TriggerFilterType, FilterHandler> = {
     NgbAccordionModule,
     NgTemplateOutlet,
     DragDropModule,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
   ],
 })
 export class WorkflowEditDialogComponent

src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.spec.ts

@@ -3,7 +3,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { of, throwError } from 'rxjs'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { PermissionsService } from 'src/app/services/permissions.service'
@@ -20,11 +19,7 @@ describe('EmailDocumentDialogComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [
-        EmailDocumentDialogComponent,
-        IfPermissionsDirective,
-        NgxBootstrapIconsModule.pick(allIcons),
-      ],
+      imports: [EmailDocumentDialogComponent, IfPermissionsDirective],
       providers: [
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),

src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.ts

@@ -1,7 +1,6 @@
 import { Component, effect, inject, signal } from '@angular/core'
 import { FormsModule } from '@angular/forms'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { DocumentService } from 'src/app/services/rest/document.service'
 import { ToastService } from 'src/app/services/toast.service'
 import { LoadingComponentWithPermissions } from '../../loading-component/loading.component'
@@ -10,7 +9,7 @@ import { LoadingComponentWithPermissions } from '../../loading-component/loading
   selector: 'pngx-email-document-dialog',
   templateUrl: './email-document-dialog.component.html',
   styleUrl: './email-document-dialog.component.scss',
-  imports: [FormsModule, NgxBootstrapIconsModule],
+  imports: [FormsModule],
 })
 export class EmailDocumentDialogComponent extends LoadingComponentWithPermissions {
   private activeModal = inject(NgbActiveModal)

src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html

@@ -1,6 +1,6 @@
 <div class="btn-group w-100" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #dropdown="ngbDropdown" (keydown)="listKeyDown($event)" [popperOptions]="popperOptions" [autoClose]="!creating()">
   <button class="btn btn-sm" id="dropdown_{{name}}" ngbDropdownToggle [ngClass]="!editing && selectionModel.selectionSize() > 0 ? 'btn-primary' : 'btn-outline-primary'" [disabled]="disabled" [aria-label]="title">
-    <i-bs name="{{icon}}"></i-bs><div class="d-none d-sm-inline ms-1">{{title}}</div>
+    <pngx-bs-icon name="{{icon}}"></pngx-bs-icon><div class="d-none d-sm-inline ms-1">{{title}}</div>
     @if (!editing && selectionModel.totalCount > 0) {
       <pngx-clearable-badge [number]="selectionModel.totalCount" [selected]="selectionModel.selectionSize() > 0" (cleared)="reset()"></pngx-clearable-badge>
     }
@@ -52,20 +52,20 @@
         @if (filteredItems.length === 0 && createRef !== undefined && filterText?.length > 0) {
           <button class="list-group-item list-group-item-action bg-light" (click)="createClicked()" [disabled]="disabled">
             <span class="ms-2"><ng-container i18n>Create</ng-container> "{{filterText}}"</span>
-            <i-bs width="1.5em" height="1em" name="plus"></i-bs>
+            <pngx-bs-icon width="1.5em" height="1em" name="plus"></pngx-bs-icon>
           </button>
         }
         @if (filteredItems.length > 0) {
           <button class="list-group-item list-group-item-action bg-light d-flex align-items-center" (click)="applyClicked()" [disabled]="!modelIsDirty() || disabled">
             <span class="ms-2" [ngClass]="{'fw-bold': modelIsDirty()}" i18n>Apply</span>
-            <i-bs width="1.5em" height="1em" name="arrow-right"></i-bs>
+            <pngx-bs-icon width="1.5em" height="1em" name="arrow-right"></pngx-bs-icon>
           </button>
         }
       }
       @if (extraButtonTitle && (showExtraButtonIfEmpty || filteredItems?.length > 0)) {
         <button class="list-group-item list-group-item-action bg-light d-flex align-items-center" (click)="extraButtonClicked($event)" [disabled]="disabled">
           <span class="ms-2 fw-bold">{{extraButtonTitle}}</span>
-          <i-bs width="1.5em" height="1em" name="arrow-right"></i-bs>
+          <pngx-bs-icon width="1.5em" height="1em" name="arrow-right"></pngx-bs-icon>
         </button>
       }
       @if (!editing && manyToOne) {

src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts

@@ -2,7 +2,6 @@ import { ScrollingModule } from '@angular/cdk/scrolling'
 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 {
@@ -63,7 +62,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),
       ],
-      imports: [NgxBootstrapIconsModule.pick(allIcons), ScrollingModule],
+      imports: [ScrollingModule],
     }).compileComponents()
 
     hotkeyService = TestBed.inject(HotKeyService)

src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts

@@ -20,8 +20,8 @@ import {
   NgbDropdownModule,
   NgbModalRef,
 } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { Subject, filter, first, merge, takeUntil } from 'rxjs'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 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'
@@ -706,7 +706,7 @@ export class FilterableDropdownSelectionModel {
     ToggleableDropdownButtonComponent,
     FormsModule,
     ReactiveFormsModule,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
     NgbDropdownModule,
     NgClass,
     ScrollingModule,

src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html

@@ -6,13 +6,13 @@
   [disabled]="disabled">
   <div class="selected-icon me-1">
     @if (isChecked()) {
-      <i-bs width="1em" height="1em" name="check"></i-bs>
+      <pngx-bs-icon width="1em" height="1em" name="check"></pngx-bs-icon>
     }
     @if (isPartiallyChecked()) {
-      <i-bs width="1em" height="1em" name="dash"></i-bs>
+      <pngx-bs-icon width="1em" height="1em" name="dash"></pngx-bs-icon>
     }
     @if (isExcluded()) {
-      <i-bs width="1em" height="1em" name="x"></i-bs>
+      <pngx-bs-icon width="1em" height="1em" name="x"></pngx-bs-icon>
     }
   </div>
   <div class="me-1 name-cell" [style.--depth]="isTag ? getDepth() + 1 : 1">

src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { MatchingModel } from 'src/app/data/matching-model'
 import { Tag } from 'src/app/data/tag'
 import { TagComponent } from '../../tag/tag.component'
@@ -15,7 +15,7 @@ export enum ToggleableItemState {
   selector: 'pngx-toggleable-dropdown-button',
   templateUrl: './toggleable-dropdown-button.component.html',
   styleUrls: ['./toggleable-dropdown-button.component.scss'],
-  imports: [TagComponent, NgxBootstrapIconsModule],
+  imports: [TagComponent, BootstrapIconComponent],
 })
 export class ToggleableDropdownButtonComponent {
   @Input()

src-ui/src/app/components/common/input/check/check.component.html

@@ -5,7 +5,7 @@
         <label class="form-label" [class.mb-md-0]="horizontal" [for]="inputId">{{title}}</label>
         @if (removable) {
           <button type="button" class="btn btn-sm btn-danger position-absolute left-0" (click)="removed.emit(this)">
-            <i-bs name="x" class="me-1"></i-bs><ng-container i18n>Remove</ng-container>
+            <pngx-bs-icon name="x" class="me-1"></pngx-bs-icon><ng-container i18n>Remove</ng-container>
             </button>
           }
         </div>

src-ui/src/app/components/common/input/check/check.component.ts

@@ -5,7 +5,7 @@ import {
   NG_VALUE_ACCESSOR,
   ReactiveFormsModule,
 } from '@angular/forms'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { AbstractInputComponent } from '../abstract-input'
 
 @Component({
@@ -19,7 +19,7 @@ import { AbstractInputComponent } from '../abstract-input'
   selector: 'pngx-input-check',
   templateUrl: './check.component.html',
   styleUrls: ['./check.component.scss'],
-  imports: [FormsModule, ReactiveFormsModule, NgClass, NgxBootstrapIconsModule],
+  imports: [FormsModule, ReactiveFormsModule, NgClass, BootstrapIconComponent],
 })
 export class CheckComponent extends AbstractInputComponent<boolean> {
   constructor() {

src-ui/src/app/components/common/input/color/color.component.html

@@ -15,7 +15,7 @@
     <input #inputField class="form-control" [class.is-invalid]="error" [id]="inputId" [(ngModel)]="value" [ngModelOptions]="{standalone: true}" (change)="onChange(value)" [autoClose]="'outside'" [ngbPopover]="popContent" #colorPicker="ngbPopover" placement="bottom" popoverClass="shadow">
 
     <button class="btn btn-outline-secondary" type="button" (click)="randomize()" aria-label="Choose a random color" i18n-aria-label>
-      <i-bs name="dice5"></i-bs>
+      <pngx-bs-icon name="dice5"></pngx-bs-icon>
     </button>
 
   </div>

src-ui/src/app/components/common/input/color/color.component.spec.ts

@@ -5,7 +5,6 @@ import {
   ReactiveFormsModule,
 } from '@angular/forms'
 import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { ColorSliderModule } from 'ngx-color/slider'
 import { ColorComponent } from './color.component'
 
@@ -22,7 +21,6 @@ describe('ColorComponent', () => {
         ReactiveFormsModule,
         NgbPopoverModule,
         ColorSliderModule,
-        NgxBootstrapIconsModule.pick(allIcons),
         ColorComponent,
       ],
     }).compileComponents()

src-ui/src/app/components/common/input/color/color.component.ts

@@ -5,8 +5,8 @@ import {
   ReactiveFormsModule,
 } from '@angular/forms'
 import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { ColorSliderModule } from 'ngx-color/slider'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { randomColor } from 'src/app/utils/color'
 import { AbstractInputComponent } from '../abstract-input'
 
@@ -22,7 +22,7 @@ import { AbstractInputComponent } from '../abstract-input'
   templateUrl: './color.component.html',
   styleUrls: ['./color.component.scss'],
   imports: [
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
     NgbPopoverModule,
     FormsModule,
     ReactiveFormsModule,

src-ui/src/app/components/common/input/custom-fields-values/custom-fields-values.component.html

@@ -75,7 +75,7 @@
         }
       }
       <button type="button" class="btn btn-link text-danger" (click)="removeSelectedField.next(fieldId)" aria-label="Remove custom field" i18n-aria-label>
-        <i-bs name="trash"></i-bs>
+        <pngx-bs-icon name="trash"></pngx-bs-icon>
       </button>
     </div>
   }

src-ui/src/app/components/common/input/custom-fields-values/custom-fields-values.component.ts

@@ -14,7 +14,7 @@ import {
 } from '@angular/forms'
 import { RouterModule } from '@angular/router'
 import { NgSelectModule } from '@ng-select/ng-select'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field'
 import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
 import { AbstractInputComponent } from '../abstract-input'
@@ -52,7 +52,7 @@ import { UrlComponent } from '../url/url.component'
     FormsModule,
     ReactiveFormsModule,
     RouterModule,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
     TextAreaComponent,
   ],
 })

src-ui/src/app/components/common/input/date/date.component.html

@@ -4,7 +4,7 @@
       <label class="form-label" [class.mb-md-0]="horizontal" [for]="inputId">{{title}}</label>
       @if (removable) {
         <button type="button" class="btn btn-sm btn-danger position-absolute left-0" (click)="removed.emit(this)">
-          <i-bs name="x" class="me-1"></i-bs><ng-container i18n>Remove</ng-container>
+          <pngx-bs-icon name="x" class="me-1"></pngx-bs-icon><ng-container i18n>Remove</ng-container>
           </button>
         }
       </div>
@@ -14,7 +14,7 @@
             (dateSelect)="onChange(value)" (change)="onChange(value)" (keypress)="onKeyPress($event)" (paste)="onPaste($event)"
             name="dp" [(ngModel)]="value" [ngModelOptions]="{standalone: true}" ngbDatepicker #datePicker="ngbDatepicker" #datePickerContent="ngModel" [disabled]="disabled" [footerTemplate]="datePickerFooterTemplate">
           <button class="btn btn-outline-secondary calendar" (click)="datePicker.toggle()" type="button" [disabled]="disabled" aria-label="Open date picker" i18n-aria-label>
-            <i-bs width="1.2em" height="1.2em" name="calendar"></i-bs>
+            <pngx-bs-icon width="1.2em" height="1.2em" name="calendar"></pngx-bs-icon>
           </button>
           <ng-template #datePickerFooterTemplate>
             <div class="btn-group-xs border-top p-2 d-flex">
@@ -24,7 +24,7 @@
           </ng-template>
           @if (showFilter) {
             <button class="btn btn-outline-secondary" type="button" (click)="onFilterDocuments()" [disabled]="this.value === null" title="{{ filterButtonTitle }}">
-              <i-bs width="1.2em" height="1.2em" name="filter"></i-bs>
+              <pngx-bs-icon width="1.2em" height="1.2em" name="filter"></pngx-bs-icon>
             </button>
           }
         </div>

src-ui/src/app/components/common/input/date/date.component.spec.ts

@@ -4,7 +4,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { NG_VALUE_ACCESSOR } from '@angular/forms'
 import { RouterModule } from '@angular/router'
 import { NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { routes } from 'src/app/app-routing.module'
 import { LocalizedDateParserFormatter } from 'src/app/utils/ngb-date-parser-formatter'
 import { DateComponent } from './date.component'
@@ -16,10 +15,7 @@ describe('DateComponent', () => {
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
-      imports: [
-        NgxBootstrapIconsModule.pick(allIcons),
-        RouterModule.forRoot(routes),
-      ],
+      imports: [RouterModule.forRoot(routes)],
       providers: [
         {
           provide: NgbDateParserFormatter,

src-ui/src/app/components/common/input/date/date.component.ts

@@ -19,7 +19,7 @@ import {
   NgbDatepickerModule,
   NgbDateStruct,
 } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { SettingsService } from 'src/app/services/settings.service'
 import { AbstractInputComponent } from '../abstract-input'
 
@@ -39,7 +39,7 @@ import { AbstractInputComponent } from '../abstract-input'
     FormsModule,
     ReactiveFormsModule,
     RouterModule,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
   ],
 })
 export class DateComponent

src-ui/src/app/components/common/input/document-link/document-link.component.html

@@ -9,7 +9,7 @@
         }
         @if (removable) {
           <button type="button" class="btn btn-sm btn-danger position-absolute left-0" (click)="removed.emit(this)">
-            <i-bs name="x" class="me-1"></i-bs><ng-container i18n>Remove</ng-container>
+            <pngx-bs-icon name="x" class="me-1"></pngx-bs-icon><ng-container i18n>Remove</ng-container>
           </button>
         }
       </div>
@@ -41,15 +41,15 @@
     <ng-template ng-label-tmp let-document="item">
       <div class="d-flex align-items-center">
         @if (!disabled) {
-          <button class="btn p-0 lh-1" (click)="unselect(document)" (mousedown)="$event.stopImmediatePropagation()" type="button" title="Remove link" i18n-title><i-bs name="x"></i-bs></button>
+          <button class="btn p-0 lh-1" (click)="unselect(document)" (mousedown)="$event.stopImmediatePropagation()" type="button" title="Remove link" i18n-title><pngx-bs-icon name="x"></pngx-bs-icon></button>
         }
         @if (document.title) {
           <a routerLink="/documents/{{document.id}}" class="badge bg-light text-primary" (mousedown)="$event.stopImmediatePropagation();" title="Open link" i18n-title>
-            <i-bs width="0.9em" height="0.9em" name="file-text" class="me-1"></i-bs><span>{{document.title}}</span>
+            <pngx-bs-icon width="0.9em" height="0.9em" name="file-text" class="me-1"></pngx-bs-icon><span>{{document.title}}</span>
           </a>
         } @else {
           <span class="badge bg-light text-muted">
-            <i-bs width="0.9em" height="0.9em" name="exclamation-triangle-fill" class="me-1"></i-bs><span i18n>Unavailable</span>
+            <pngx-bs-icon width="0.9em" height="0.9em" name="exclamation-triangle-fill" class="me-1"></pngx-bs-icon><span i18n>Unavailable</span>
           </span>
         }
       </div>

src-ui/src/app/components/common/input/document-link/document-link.component.scss

@@ -19,7 +19,7 @@
     }
 }
 
-i-bs {
+pngx-bs-icon {
     cursor: pointer;
 }
 

src-ui/src/app/components/common/input/document-link/document-link.component.spec.ts

@@ -5,7 +5,6 @@ import { NG_VALUE_ACCESSOR } from '@angular/forms'
 import { By } from '@angular/platform-browser'
 import { provideRouter } from '@angular/router'
 import { NgSelectComponent } from '@ng-select/ng-select'
-import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { of, Subject, throwError } from 'rxjs'
 import { FILTER_SIMPLE_TITLE } from 'src/app/data/filter-rule-type'
 import { DocumentService } from 'src/app/services/rest/document.service'
@@ -37,7 +36,7 @@ describe('DocumentLinkComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [DocumentLinkComponent, NgxBootstrapIconsModule.pick(allIcons)],
+      imports: [DocumentLinkComponent],
       providers: [
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),

src-ui/src/app/components/common/input/document-link/document-link.component.ts

@@ -15,7 +15,6 @@ import {
 } from '@angular/forms'
 import { RouterModule } from '@angular/router'
 import { NgSelectModule } from '@ng-select/ng-select'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import {
   catchError,
   concat,
@@ -28,6 +27,7 @@ import {
   takeUntil,
   tap,
 } from 'rxjs'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { Document } from 'src/app/data/document'
 import { FILTER_SIMPLE_TITLE } from 'src/app/data/filter-rule-type'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
@@ -53,7 +53,7 @@ import { AbstractInputComponent } from '../abstract-input'
     RouterModule,
     NgTemplateOutlet,
     NgSelectModule,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
   ],
 })
 export class DocumentLinkComponent

src-ui/src/app/components/common/input/entries/entries.component.html

@@ -5,7 +5,7 @@
         <label class="form-label mb-0" [class.mb-md-0]="horizontal" [for]="inputId">{{title}}</label>
       }
       <button type="button" class="btn btn-sm btn-outline-primary ms-4" (click)="addEntry()">
-        <i-bs name="plus-circle" class="me-1"></i-bs><ng-container i18n>Add</ng-container>
+        <pngx-bs-icon name="plus-circle" class="me-1"></pngx-bs-icon><ng-container i18n>Add</ng-container>
       </button>
     </div>
     <div class="position-relative">
@@ -14,7 +14,7 @@
           <input type="text" class="form-control" [(ngModel)]="entry[0]" [ngModelOptions]="{standalone: true}" (change)="inputChange()" [disabled]="disabled" autocomplete="off">
           <input type="text" class="form-control" [(ngModel)]="entry[1]" [ngModelOptions]="{standalone: true}" (change)="inputChange()" [disabled]="disabled" autocomplete="off">
           <button type="button" class="btn btn-outline-secondary" (click)="removeEntry(i)" aria-label="Remove entry" i18n-aria-label>
-            <i-bs class="text-danger" name="trash"></i-bs>
+            <pngx-bs-icon class="text-danger" name="trash"></pngx-bs-icon>
           </button>
         </div>
       }

src-ui/src/app/components/common/input/entries/entries.component.spec.ts

@@ -4,7 +4,6 @@ import {
   NG_VALUE_ACCESSOR,
   ReactiveFormsModule,
 } from '@angular/forms'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { EntriesComponent } from './entries.component'
 
 describe('EntriesComponent', () => {
@@ -13,12 +12,7 @@ describe('EntriesComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [
-        FormsModule,
-        ReactiveFormsModule,
-        NgxBootstrapIconsModule.pick(allIcons),
-        EntriesComponent,
-      ],
+      imports: [FormsModule, ReactiveFormsModule, EntriesComponent],
     }).compileComponents()
   })
 

src-ui/src/app/components/common/input/entries/entries.component.ts

@@ -4,7 +4,7 @@ import {
   NG_VALUE_ACCESSOR,
   ReactiveFormsModule,
 } from '@angular/forms'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { AbstractInputComponent } from '../abstract-input'
 
 @Component({
@@ -18,7 +18,7 @@ import { AbstractInputComponent } from '../abstract-input'
   selector: 'pngx-input-entries',
   templateUrl: './entries.component.html',
   styleUrl: './entries.component.scss',
-  imports: [FormsModule, ReactiveFormsModule, NgxBootstrapIconsModule],
+  imports: [FormsModule, ReactiveFormsModule, BootstrapIconComponent],
 })
 export class EntriesComponent extends AbstractInputComponent<object> {
   entries = []

src-ui/src/app/components/common/input/file/file.component.html

@@ -6,7 +6,7 @@
         }
         @if (removable) {
           <button type="button" class="btn btn-sm btn-danger position-absolute left-0" (click)="removed.emit(this)">
-            <i-bs name="x" class="me-1"></i-bs><ng-container i18n>Remove</ng-container>
+            <pngx-bs-icon name="x" class="me-1"></pngx-bs-icon><ng-container i18n>Remove</ng-container>
             </button>
           }
         </div>
@@ -18,7 +18,7 @@
             <div class="form-text d-flex align-items-center">
               <span class="text-muted">{{filename}}</span>
               <button type="button" class="btn btn-link btn-sm text-danger ms-2" (click)="clear()">
-                <i-bs name="x"></i-bs><small i18n>Remove</small>
+                <pngx-bs-icon name="x"></pngx-bs-icon><small i18n>Remove</small>
               </button>
             </div>
         }

src-ui/src/app/components/common/input/monetary/monetary.component.html

@@ -6,7 +6,7 @@
       }
       @if (removable) {
         <button type="button" class="btn btn-sm btn-danger position-absolute left-0" (click)="removed.emit(this)">
-          <i-bs name="x" class="me-1"></i-bs><ng-container i18n>Remove</ng-container>
+          <pngx-bs-icon name="x" class="me-1"></pngx-bs-icon><ng-container i18n>Remove</ng-container>
         </button>
       }
     </div>

src-ui/src/app/components/common/input/monetary/monetary.component.ts

@@ -5,7 +5,7 @@ import {
   NG_VALUE_ACCESSOR,
   ReactiveFormsModule,
 } from '@angular/forms'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { AbstractInputComponent } from '../abstract-input'
 
 @Component({
@@ -23,7 +23,7 @@ import { AbstractInputComponent } from '../abstract-input'
     CurrencyPipe,
     FormsModule,
     ReactiveFormsModule,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
   ],
 })
 export class MonetaryComponent extends AbstractInputComponent<string> {

src-ui/src/app/components/common/input/number/number.component.html

@@ -6,7 +6,7 @@
       }
       @if (removable) {
         <button type="button" class="btn btn-sm btn-danger position-absolute left-0" (click)="removed.emit(this)">
-          <i-bs name="x" class="me-1"></i-bs><ng-container i18n>Remove</ng-container>
+          <pngx-bs-icon name="x" class="me-1"></pngx-bs-icon><ng-container i18n>Remove</ng-container>
           </button>
         }
       </div>

src-ui/src/app/components/common/input/number/number.component.ts

@@ -4,7 +4,7 @@ import {
   NG_VALUE_ACCESSOR,
   ReactiveFormsModule,
 } from '@angular/forms'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { DocumentService } from 'src/app/services/rest/document.service'
 import { AbstractInputComponent } from '../abstract-input'
 
@@ -19,7 +19,7 @@ import { AbstractInputComponent } from '../abstract-input'
   selector: 'pngx-input-number',
   templateUrl: './number.component.html',
   styleUrls: ['./number.component.scss'],
-  imports: [FormsModule, ReactiveFormsModule, NgxBootstrapIconsModule],
+  imports: [FormsModule, ReactiveFormsModule, BootstrapIconComponent],
 })
 export class NumberComponent extends AbstractInputComponent<number> {
   private documentService = inject(DocumentService)

src-ui/src/app/components/common/input/password/password.component.html

@@ -10,7 +10,7 @@
       <input #inputField [type]="showReveal && textVisible ? 'text' : 'password'" class="form-control" [class.is-invalid]="error" [id]="inputId" [(ngModel)]="value" [ngModelOptions]="{standalone: true}" (focus)="onFocus()" (focusout)="onFocusOut()" (change)="onChange(value)" [disabled]="disabled" [autocomplete]="autocomplete">
       @if (showReveal) {
         <button type="button" class="btn btn-outline-secondary" (click)="toggleVisibility()" i18n-title title="Show password" [disabled]="disabled || disableRevealToggle">
-          <i-bs name="eye"></i-bs>
+          <pngx-bs-icon name="eye"></pngx-bs-icon>
         </button>
       }
     </div>

src-ui/src/app/components/common/input/password/password.component.spec.ts

@@ -5,7 +5,6 @@ import {
   ReactiveFormsModule,
 } from '@angular/forms'
 import { By } from '@angular/platform-browser'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { PasswordComponent } from './password.component'
 
 describe('PasswordComponent', () => {
@@ -16,12 +15,7 @@ describe('PasswordComponent', () => {
   beforeEach(async () => {
     TestBed.configureTestingModule({
       providers: [],
-      imports: [
-        FormsModule,
-        ReactiveFormsModule,
-        NgxBootstrapIconsModule.pick(allIcons),
-        PasswordComponent,
-      ],
+      imports: [FormsModule, ReactiveFormsModule, PasswordComponent],
     }).compileComponents()
 
     fixture = TestBed.createComponent(PasswordComponent)

src-ui/src/app/components/common/input/password/password.component.ts

@@ -4,7 +4,7 @@ import {
   NG_VALUE_ACCESSOR,
   ReactiveFormsModule,
 } from '@angular/forms'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { AbstractInputComponent } from '../abstract-input'
 
 @Component({
@@ -18,7 +18,7 @@ import { AbstractInputComponent } from '../abstract-input'
   selector: 'pngx-input-password',
   templateUrl: './password.component.html',
   styleUrls: ['./password.component.scss'],
-  imports: [FormsModule, ReactiveFormsModule, NgxBootstrapIconsModule],
+  imports: [FormsModule, ReactiveFormsModule, BootstrapIconComponent],
 })
 export class PasswordComponent extends AbstractInputComponent<string> {
   @Input()

src-ui/src/app/components/common/input/select/select.component.html

@@ -7,7 +7,7 @@
         }
         @if (removable) {
           <button type="button" class="btn btn-sm btn-danger position-absolute left-0" (click)="removed.emit(this)">
-            <i-bs  name="x" class="me-1"></i-bs><ng-container i18n>Remove</ng-container>
+            <pngx-bs-icon  name="x" class="me-1"></pngx-bs-icon><ng-container i18n>Remove</ng-container>
             </button>
         }
       </div>
@@ -42,26 +42,26 @@
             }
             <span class="ng-value-label" [title]="item[bindLabel]">
               @if (iconField && item[iconField]) {
-                <i-bs class="me-2" [name]="item[iconField]"></i-bs>
+                <pngx-bs-icon class="me-2" [name]="item[iconField]"></pngx-bs-icon>
               }
               {{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>
+                <pngx-bs-icon class="me-2" [name]="item[iconField]"></pngx-bs-icon>
               }
               <span [title]="item[bindLabel]">{{item[bindLabel]}}</span>
           </ng-template>
         </ng-select>
         @if (allowCreateNew && !hideAddButton) {
           <button class="btn btn-outline-secondary" type="button" (click)="addItem()" [disabled]="disabled" aria-label="Create new item" i18n-aria-label>
-            <i-bs width="1.2em" height="1.2em" name="plus"></i-bs>
+            <pngx-bs-icon width="1.2em" height="1.2em" name="plus"></pngx-bs-icon>
           </button>
         }
         @if (showFilter) {
           <button class="btn btn-outline-secondary" type="button" (click)="onFilterDocuments()" [disabled]="isPrivate || this.value === null" title="{{ filterButtonTitle }}">
-            <i-bs width="1.2em" height="1.2em" name="filter"></i-bs>
+            <pngx-bs-icon width="1.2em" height="1.2em" name="filter"></pngx-bs-icon>
           </button>
         }
       </div>

src-ui/src/app/components/common/input/select/select.component.ts

@@ -12,7 +12,7 @@ import {
 } from '@angular/forms'
 import { RouterModule } from '@angular/router'
 import { NgSelectModule } from '@ng-select/ng-select'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { matchesSearchText } from 'src/app/utils/text-search'
 import { AbstractInputComponent } from '../abstract-input'
 
@@ -32,7 +32,7 @@ import { AbstractInputComponent } from '../abstract-input'
     FormsModule,
     ReactiveFormsModule,
     RouterModule,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
   ],
 })
 export class SelectComponent extends AbstractInputComponent<number | string> {

src-ui/src/app/components/common/input/switch/switch.component.html

@@ -5,12 +5,12 @@
         <label class="form-label" [for]="inputId" [ngbTooltip]="showUnsetNote && isUnset ? tipContent: null" placement="end">
           {{title}}
           @if (showUnsetNote && isUnset) {
-            <i-bs width="0.9em" height="0.9em" name="exclamation-triangle"></i-bs>
+            <pngx-bs-icon width="0.9em" height="0.9em" name="exclamation-triangle"></pngx-bs-icon>
           }
         </label>
         @if (removable) {
           <button type="button" class="btn btn-sm btn-danger position-absolute left-0" (click)="removed.emit(this)">
-            <i-bs  name="x" class="me-1"></i-bs><ng-container i18n>Remove</ng-container>
+            <pngx-bs-icon  name="x" class="me-1"></pngx-bs-icon><ng-container i18n>Remove</ng-container>
           </button>
         }
       </div>
@@ -22,7 +22,7 @@
           <label class="form-check-label" [class.text-muted]="showUnsetNote && isUnset" [for]="inputId" [ngbTooltip]="showUnsetNote && isUnset ? tipContent: null" placement="end">
             {{title}}
             @if (showUnsetNote && isUnset) {
-              <i-bs class="ms-1" width="0.9em" height="0.9em" name="exclamation-triangle"></i-bs>
+              <pngx-bs-icon class="ms-1" width="0.9em" height="0.9em" name="exclamation-triangle"></pngx-bs-icon>
             }
           </label>
         }

src-ui/src/app/components/common/input/tags/tags.component.html

@@ -22,7 +22,7 @@
 
           <ng-template ng-label-tmp let-item="item">
             <button class="tag-wrap btn p-0 d-flex align-items-center" (click)="removeTag(item.id)" (mousedown)="$event.stopImmediatePropagation()" type="button" title="Remove tag" i18n-title>
-              <i-bs name="x" style="margin-inline-end: 1px;"></i-bs>
+              <pngx-bs-icon name="x" style="margin-inline-end: 1px;"></pngx-bs-icon>
               @if (item.id && tags) {
                 <pngx-tag style="background-color: none;" [tag]="getTag(item.id)"></pngx-tag>
               }
@@ -32,12 +32,12 @@
             <div class="tag-option-row d-flex align-items-center" [class.w-auto]="!getTag(item.id)?.parent">
               @if (item.id && tags) {
                 @if (getTag(item.id)?.parent) {
-                  <i-bs name="list-nested" class="me-1"></i-bs>
+                  <pngx-bs-icon name="list-nested" class="me-1"></pngx-bs-icon>
                   <span class="hierarchy-reveal d-flex align-items-center">
                     <span class="parents d-flex align-items-center">
                       @for (p of getParentChain(item.id); track p.id) {
                         <span class="badge me-1" [style.background]="p.color" [style.color]="p.text_color">{{p.name}}</span>
-                        <i-bs name="chevron-right" width=".8em" height=".8em" class="me-1"></i-bs>
+                        <pngx-bs-icon name="chevron-right" width=".8em" height=".8em" class="me-1"></pngx-bs-icon>
                       }
                     </span>
                   </span>
@@ -49,12 +49,12 @@
         </ng-select>
         @if (allowCreate && !hideAddButton) {
           <button class="btn btn-outline-secondary" type="button" (click)="createTag(null, true)" [disabled]="disabled" aria-label="Create new tag" i18n-aria-label>
-            <i-bs width="1.2em" height="1.2em" name="plus"></i-bs>
+            <pngx-bs-icon width="1.2em" height="1.2em" name="plus"></pngx-bs-icon>
           </button>
         }
         @if (showFilter) {
           <button class="btn btn-outline-secondary" type="button" (click)="onFilterDocuments()" [disabled]="hasPrivate || this.value === null" i18n-title title="Filter documents with these Tags">
-            <i-bs width="1.2em" height="1.2em" name="filter"></i-bs>
+            <pngx-bs-icon width="1.2em" height="1.2em" name="filter"></pngx-bs-icon>
           </button>
         }
       </div>

src-ui/src/app/components/common/input/tags/tags.component.spec.ts

@@ -15,7 +15,6 @@ import {
   NgbPopoverModule,
 } from '@ng-bootstrap/ng-bootstrap'
 import { NgSelectModule } from '@ng-select/ng-select'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { of } from 'rxjs'
 import {
   DEFAULT_MATCHING_ALGORITHM,
@@ -71,7 +70,6 @@ describe('TagsComponent', () => {
         NgbModalModule,
         NgbAccordionModule,
         NgbPopoverModule,
-        NgxBootstrapIconsModule.pick(allIcons),
         TagsComponent,
         TagEditDialogComponent,
         TextComponent,

src-ui/src/app/components/common/input/tags/tags.component.ts

@@ -18,8 +18,8 @@ import {
 import { RouterModule } from '@angular/router'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgSelectComponent, NgSelectModule } from '@ng-select/ng-select'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { first, firstValueFrom, tap } from 'rxjs'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { Tag } from 'src/app/data/tag'
 import { TagService } from 'src/app/services/rest/tag.service'
 import { matchesSearchText } from 'src/app/utils/text-search'
@@ -44,7 +44,7 @@ import { TagComponent } from '../../tag/tag.component'
     FormsModule,
     ReactiveFormsModule,
     RouterModule,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
   ],
 })
 export class TagsComponent implements OnInit, ControlValueAccessor {

src-ui/src/app/components/common/input/text/text.component.html

@@ -6,7 +6,7 @@
       }
       @if (removable) {
         <button type="button" class="btn btn-sm btn-danger position-absolute left-0" (click)="removed.emit(this)">
-          <i-bs name="x" class="me-1"></i-bs><ng-container i18n>Remove</ng-container>
+          <pngx-bs-icon name="x" class="me-1"></pngx-bs-icon><ng-container i18n>Remove</ng-container>
           </button>
         }
       </div>

src-ui/src/app/components/common/input/text/text.component.ts

@@ -5,7 +5,7 @@ import {
   ReactiveFormsModule,
 } from '@angular/forms'
 import { RouterLink } from '@angular/router'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { AbstractInputComponent } from '../abstract-input'
 
 @Component({
@@ -22,7 +22,7 @@ import { AbstractInputComponent } from '../abstract-input'
   imports: [
     FormsModule,
     ReactiveFormsModule,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
     RouterLink,
   ],
 })

src-ui/src/app/components/common/input/textarea/textarea.component.html

@@ -6,7 +6,7 @@
       }
       @if (removable) {
         <button type="button" class="btn btn-sm btn-danger position-absolute left-0" (click)="removed.emit(this)">
-          <i-bs name="x" class="me-1"></i-bs><ng-container i18n>Remove</ng-container>
+          <pngx-bs-icon name="x" class="me-1"></pngx-bs-icon><ng-container i18n>Remove</ng-container>
           </button>
         }
       </div>

src-ui/src/app/components/common/input/textarea/textarea.component.ts

@@ -4,7 +4,7 @@ import {
   NG_VALUE_ACCESSOR,
   ReactiveFormsModule,
 } from '@angular/forms'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { AbstractInputComponent } from '../abstract-input'
 
 @Component({
@@ -18,7 +18,7 @@ import { AbstractInputComponent } from '../abstract-input'
   selector: 'pngx-input-textarea',
   templateUrl: './textarea.component.html',
   styleUrls: ['./textarea.component.scss'],
-  imports: [FormsModule, ReactiveFormsModule, NgxBootstrapIconsModule],
+  imports: [FormsModule, ReactiveFormsModule, BootstrapIconComponent],
 })
 export class TextAreaComponent extends AbstractInputComponent<string> {
   @Input()

src-ui/src/app/components/common/input/url/url.component.html

@@ -4,7 +4,7 @@
       <label class="form-label" [class.mb-md-0]="horizontal" [for]="inputId">{{title}}</label>
       @if (removable) {
         <button type="button" class="btn btn-sm btn-danger position-absolute left-0" (click)="removed.emit(this)">
-          <i-bs name="x" class="me-1"></i-bs><ng-container i18n>Remove</ng-container>
+          <pngx-bs-icon name="x" class="me-1"></pngx-bs-icon><ng-container i18n>Remove</ng-container>
         </button>
       }
     </div>
@@ -12,7 +12,7 @@
       <div class="input-group" [class.is-invalid]="error">
         <input #inputField type="url" class="form-control" [class.is-invalid]="error" placeholder="https://" [id]="inputId" [(ngModel)]="value" [ngModelOptions]="{standalone: true}" (change)="onChange(value)" [disabled]="disabled">
         <a class="btn btn-outline-secondary rounded-end" title="Open link" i18n-title [href]="value" target="_blank">
-          <i-bs width="1.2em" height="1.2em" name="box-arrow-up-right"></i-bs>
+          <pngx-bs-icon width="1.2em" height="1.2em" name="box-arrow-up-right"></pngx-bs-icon>
         </a>
         <div class="invalid-feedback position-absolute top-100">
           {{error}}

src-ui/src/app/components/common/input/url/url.component.spec.ts

@@ -4,7 +4,6 @@ import {
   NG_VALUE_ACCESSOR,
   ReactiveFormsModule,
 } from '@angular/forms'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { UrlComponent } from './url.component'
 
 describe('TextComponent', () => {
@@ -15,12 +14,7 @@ describe('TextComponent', () => {
   beforeEach(async () => {
     TestBed.configureTestingModule({
       providers: [],
-      imports: [
-        FormsModule,
-        ReactiveFormsModule,
-        NgxBootstrapIconsModule.pick(allIcons),
-        UrlComponent,
-      ],
+      imports: [FormsModule, ReactiveFormsModule, UrlComponent],
     }).compileComponents()
 
     fixture = TestBed.createComponent(UrlComponent)

src-ui/src/app/components/common/input/url/url.component.ts

@@ -4,7 +4,7 @@ import {
   NG_VALUE_ACCESSOR,
   ReactiveFormsModule,
 } from '@angular/forms'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { AbstractInputComponent } from '../abstract-input'
 
 @Component({
@@ -18,7 +18,7 @@ import { AbstractInputComponent } from '../abstract-input'
   selector: 'pngx-input-url',
   templateUrl: './url.component.html',
   styleUrls: ['./url.component.scss'],
-  imports: [NgxBootstrapIconsModule, FormsModule, ReactiveFormsModule],
+  imports: [BootstrapIconComponent, FormsModule, ReactiveFormsModule],
 })
 export class UrlComponent extends AbstractInputComponent<string> {
   constructor() {

src-ui/src/app/components/common/page-header/page-header.component.html

@@ -5,7 +5,7 @@
       @if (id()) {
         <button type="button" class="badge border-0 bg-primary text-primary-text-contrast ms-3 small fs-normal" (click)="copyID()" title="Copy ID" i18n-title>
           @if (copied()) {
-            <i-bs width="1em" height="1em" name="clipboard-check" class="me-1"></i-bs><ng-container i18n>Copied!</ng-container>
+            <pngx-bs-icon width="1em" height="1em" name="clipboard-check" class="me-1"></pngx-bs-icon><ng-container i18n>Copied!</ng-container>
           } @else {
             ID: {{id()}}
           }
@@ -16,13 +16,13 @@
       }
       @if (info()) {
         <button class="btn btn-sm btn-link text-muted p-0 ms-2 p-md-2 ms-md-0" title="What's this?" i18n-title type="button" [ngbPopover]="infoPopover" [autoClose]="true">
-          <i-bs name="question-circle"></i-bs>
+          <pngx-bs-icon name="question-circle"></pngx-bs-icon>
         </button>
         <ng-template #infoPopover>
           <p [class.mb-0]="!infoLink()" [innerHTML]="info()"></p>
           @if (infoLink()) {
             <a href="https://docs.paperless-ngx.com/{{infoLink()}}" target="_blank" referrerpolicy="noopener noreferrer" i18n>Read more</a>
-            <i-bs class="ms-1" width=".8em" height=".8em" name="box-arrow-up-right"></i-bs>
+            <pngx-bs-icon class="ms-1" width=".8em" height=".8em" name="box-arrow-up-right"></pngx-bs-icon>
           }
         </ng-template>
       }

src-ui/src/app/components/common/page-header/page-header.component.spec.ts

@@ -1,7 +1,6 @@
 import { Clipboard } from '@angular/cdk/clipboard'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { Title } from '@angular/platform-browser'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { environment } from 'src/environments/environment'
 import { PageHeaderComponent } from './page-header.component'
 
@@ -14,7 +13,7 @@ describe('PageHeaderComponent', () => {
   beforeEach(async () => {
     TestBed.configureTestingModule({
       providers: [],
-      imports: [NgxBootstrapIconsModule.pick(allIcons), PageHeaderComponent],
+      imports: [PageHeaderComponent],
     }).compileComponents()
 
     titleService = TestBed.inject(Title)

src-ui/src/app/components/common/page-header/page-header.component.ts

@@ -2,15 +2,15 @@ import { Clipboard } from '@angular/cdk/clipboard'
 import { Component, effect, inject, input, signal } from '@angular/core'
 import { Title } from '@angular/platform-browser'
 import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { TourNgBootstrap } from 'ngx-ui-tour-ng-bootstrap'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { environment } from 'src/environments/environment'
 
 @Component({
   selector: 'pngx-page-header',
   templateUrl: './page-header.component.html',
   styleUrls: ['./page-header.component.scss'],
-  imports: [NgbPopoverModule, NgxBootstrapIconsModule, TourNgBootstrap],
+  imports: [NgbPopoverModule, BootstrapIconComponent, TourNgBootstrap],
 })
 export class PageHeaderComponent {
   private titleService = inject(Title)

src-ui/src/app/components/common/pdf-editor/pdf-editor.component.html

@@ -7,21 +7,21 @@
   <div class="btn-toolbar mb-2">
     <div class="btn-group me-3">
       <button class="btn btn-sm btn-secondary" (click)="selectAll()" title="Select all pages" i18n-title>
-        <i-bs name="check-all"></i-bs>
+        <pngx-bs-icon name="check-all"></pngx-bs-icon>
       </button>
       <button class="btn btn-sm btn-secondary" (click)="deselectAll()" [disabled]="!hasSelection()" title="Deselect all pages" i18n-title>
-        <i-bs name="x"></i-bs>
+        <pngx-bs-icon name="x"></pngx-bs-icon>
       </button>
     </div>
     <div class="btn-group">
       <button class="btn btn-sm btn-secondary" (click)="rotateSelected(-90)" [disabled]="!hasSelection()" title="Rotate selected pages counter-clockwise" i18n-title>
-        <i-bs name="arrow-counterclockwise"></i-bs>
+        <pngx-bs-icon name="arrow-counterclockwise"></pngx-bs-icon>
       </button>
       <button class="btn btn-sm btn-secondary" (click)="rotateSelected(90)" [disabled]="!hasSelection()" title="Rotate selected pages clockwise" i18n-title>
-        <i-bs name="arrow-clockwise"></i-bs>
+        <pngx-bs-icon name="arrow-clockwise"></pngx-bs-icon>
       </button>
       <button class="btn btn-sm btn-danger" (click)="deleteSelected()" [disabled]="!hasSelection()" title="Delete selected pages" i18n-title>
-        <i-bs name="trash"></i-bs>
+        <pngx-bs-icon name="trash"></pngx-bs-icon>
       </button>
     </div>
   </div>
@@ -31,18 +31,18 @@
         <div class="btn-toolbar hover-actions z-10">
           <div class="btn-group me-2">
             <button class="btn btn-sm btn-dark" (click)="rotate(i, true); $event.stopPropagation()" title="Rotate page counter-clockwise" i18n-title>
-              <i-bs name="arrow-counterclockwise"></i-bs>
+              <pngx-bs-icon name="arrow-counterclockwise"></pngx-bs-icon>
             </button>
             <button class="btn btn-sm btn-dark" (click)="rotate(i); $event.stopPropagation()" title="Rotate page clockwise" i18n-title>
-              <i-bs name="arrow-clockwise"></i-bs>
+              <pngx-bs-icon name="arrow-clockwise"></pngx-bs-icon>
             </button>
           </div>
           <div class="btn-group">
             <button class="btn btn-sm btn-dark text-danger" (click)="remove(i); $event.stopPropagation()" title="Delete page" i18n-title>
-              <i-bs name="trash"></i-bs>
+              <pngx-bs-icon name="trash"></pngx-bs-icon>
             </button>
             <button class="btn btn-sm btn-dark" (click)="toggleSplit(i); $event.stopPropagation()" title="Add / remove document split here" i18n-title>
-              <i-bs name="scissors"></i-bs>
+              <pngx-bs-icon name="scissors"></pngx-bs-icon>
             </button>
           </div>
         </div>
@@ -78,12 +78,12 @@
     <div class="btn-group" role="group">
       <input type="radio" class="btn-check" [(ngModel)]="editMode" [value]="PdfEditorEditMode.Create" id="editModeCreate" name="editmode">
       <label for="editModeCreate" class="btn btn-outline-primary btn-sm">
-        <i-bs name="plus"></i-bs>
+        <pngx-bs-icon name="plus"></pngx-bs-icon>
         <span class="form-check-label ms-1" i18n>Create new document(s)</span>
       </label>
       <input type="radio" class="btn-check" [(ngModel)]="editMode" [value]="PdfEditorEditMode.Update" id="editModeUpdate" name="editmode" [disabled]="hasSplit()">
       <label for="editModeUpdate" class="btn btn-outline-primary btn-sm">
-        <i-bs name="pencil"></i-bs>
+        <pngx-bs-icon name="pencil"></pngx-bs-icon>
         <span class="form-check-label ms-2" i18n>Add document version</span>
       </label>
     </div>

src-ui/src/app/components/common/pdf-editor/pdf-editor.component.spec.ts

@@ -2,7 +2,6 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { DocumentService } from 'src/app/services/rest/document.service'
 import { PDFEditorComponent } from './pdf-editor.component'
 
@@ -12,7 +11,7 @@ describe('PDFEditorComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [PDFEditorComponent, NgxBootstrapIconsModule.pick(allIcons)],
+      imports: [PDFEditorComponent],
       providers: [
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),

src-ui/src/app/components/common/pdf-editor/pdf-editor.component.ts

@@ -6,7 +6,7 @@ import {
 import { Component, inject, signal } from '@angular/core'
 import { FormsModule } from '@angular/forms'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
 import { DocumentService } from 'src/app/services/rest/document.service'
 import { SettingsService } from 'src/app/services/settings.service'
@@ -33,7 +33,7 @@ interface PageOperation {
   imports: [
     DragDropModule,
     FormsModule,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
     PngxPdfViewerComponent,
   ],
 })

src-ui/src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.html

@@ -1,6 +1,6 @@
 <div class="btn-group w-100" ngbDropdown role="group">
   <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="isActive ? 'btn-primary' : 'btn-outline-primary'" [disabled]="disabled" [aria-label]="title">
-    <i-bs name="person-fill-lock"></i-bs><div class="d-none d-sm-inline ms-1">{{title}}</div>
+    <pngx-bs-icon name="person-fill-lock"></pngx-bs-icon><div class="d-none d-sm-inline ms-1">{{title}}</div>
     <pngx-clearable-badge [selected]="isActive" (cleared)="reset()"></pngx-clearable-badge><span class="visually-hidden">selected</span>
   </button>
   <div [id]="dropdownMenuId" class="dropdown-menu permission-filter-dropdown shadow py-0 w-2" ngbDropdownMenu attr.aria-labelledby="dropdown{{title}}">
@@ -8,7 +8,7 @@
       <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.NONE)" [disabled]="disabled">
         <div class="selected-icon me-1">
           @if (selectionModel.ownerFilter() === OwnerFilterType.NONE) {
-            <i-bs width="1em" height="1em" name="check"></i-bs>
+            <pngx-bs-icon width="1em" height="1em" name="check"></pngx-bs-icon>
           }
         </div>
         <div class="me-1">
@@ -18,7 +18,7 @@
       <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.SELF)" [disabled]="disabled">
         <div class="selected-icon me-1">
           @if (selectionModel.ownerFilter() === OwnerFilterType.SELF) {
-            <i-bs width="1em" height="1em" name="check"></i-bs>
+            <pngx-bs-icon width="1em" height="1em" name="check"></pngx-bs-icon>
           }
         </div>
         <div class="me-1">
@@ -28,7 +28,7 @@
       <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">
         <div class="selected-icon me-1">
           @if (selectionModel.ownerFilter() === OwnerFilterType.NOT_SELF) {
-            <i-bs width="1em" height="1em" name="check"></i-bs>
+            <pngx-bs-icon width="1em" height="1em" name="check"></pngx-bs-icon>
           }
         </div>
         <div class="me-1">
@@ -38,7 +38,7 @@
       <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">
         <div class="selected-icon me-1">
           @if (selectionModel.ownerFilter() === OwnerFilterType.SHARED_BY_ME) {
-            <i-bs width="1em" height="1em" name="check"></i-bs>
+            <pngx-bs-icon width="1em" height="1em" name="check"></pngx-bs-icon>
           }
         </div>
         <div class="me-1">
@@ -48,7 +48,7 @@
       <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">
         <div class="selected-icon me-1">
           @if (selectionModel.ownerFilter() === OwnerFilterType.UNOWNED) {
-            <i-bs width="1em" height="1em" name="check"></i-bs>
+            <pngx-bs-icon width="1em" height="1em" name="check"></pngx-bs-icon>
           }
         </div>
         <div class="me-1">
@@ -59,8 +59,8 @@
         <div class="selected-icon me-1">
           @if (selectionModel.ownerFilter() === OwnerFilterType.OTHERS) {
             <a class="text-reset focus-variants" href="javascript:void(0)" (click)="clearIncludeUsers()" aria-label="Clear selected users" i18n-aria-label>
-              <i-bs width="1em" height="1em" name="check" class="variant-unfocused"></i-bs>
-              <i-bs width="1em" height="1em" name="x" class="variant-focused text-primary"></i-bs>
+              <pngx-bs-icon width="1em" height="1em" name="check" class="variant-unfocused"></pngx-bs-icon>
+              <pngx-bs-icon width="1em" height="1em" name="x" class="variant-focused text-primary"></pngx-bs-icon>
             </a>
           }
         </div>

src-ui/src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.spec.ts

@@ -4,7 +4,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgSelectModule } from '@ng-select/ng-select'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { of } from 'rxjs'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { PermissionsService } from 'src/app/services/permissions.service'
@@ -31,7 +30,6 @@ describe('PermissionsFilterDropdownComponent', () => {
         FormsModule,
         ReactiveFormsModule,
         NgbModule,
-        NgxBootstrapIconsModule.pick(allIcons),
         PermissionsFilterDropdownComponent,
         ClearableBadgeComponent,
         IfPermissionsDirective,

src-ui/src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.ts

@@ -11,8 +11,8 @@ import {
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgSelectComponent } from '@ng-select/ng-select'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { first } from 'rxjs'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { User } from 'src/app/data/user'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import {
@@ -62,7 +62,7 @@ export enum OwnerFilterType {
     NgbDropdownModule,
     NgSelectComponent,
     NgClass,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
   ],
 })
 export class PermissionsFilterDropdownComponent extends ComponentWithPermissions {

src-ui/src/app/components/common/permissions-select/permissions-select.component.html

@@ -2,12 +2,12 @@
   <label class="form-label">
     {{title}}
     <button class="btn btn-sm btn-link text-muted me-auto p-0 p-md-2" title="What's this?" i18n-title type="button" [ngbPopover]="infoPopover" [autoClose]="true" container="body">
-      <i-bs name="question-circle"></i-bs>
+      <pngx-bs-icon name="question-circle"></pngx-bs-icon>
     </button>
     <ng-template #infoPopover>
       <p i18n>Global permissions define what areas of the app and API endpoints users can access.</p>
       <a href="https://docs.paperless-ngx.com/usage/#global-permissions" target="_blank" referrerpolicy="noopener noreferrer" i18n>Read more</a>
-      <i-bs class="ms-1" width=".8em" height=".8em" name="box-arrow-up-right"></i-bs>
+      <pngx-bs-icon class="ms-1" width=".8em" height=".8em" name="box-arrow-up-right"></pngx-bs-icon>
     </ng-template>
   </label>
   <ul class="list-group">

src-ui/src/app/components/common/permissions-select/permissions-select.component.spec.ts

@@ -3,7 +3,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { NG_VALUE_ACCESSOR } from '@angular/forms'
 import { By } from '@angular/platform-browser'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
 import {
   PermissionAction,
@@ -34,10 +33,7 @@ describe('PermissionsSelectComponent', () => {
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
-      imports: [
-        NgxBootstrapIconsModule.pick(allIcons),
-        PermissionsSelectComponent,
-      ],
+      imports: [PermissionsSelectComponent],
       providers: [
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),

src-ui/src/app/components/common/permissions-select/permissions-select.component.ts

@@ -10,7 +10,7 @@ import {
   ReactiveFormsModule,
 } from '@angular/forms'
 import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
 import {
   PermissionAction,
@@ -33,7 +33,7 @@ import { ComponentWithPermissions } from '../../with-permissions/with-permission
   styleUrls: ['./permissions-select.component.scss'],
   imports: [
     KeyValuePipe,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
     NgbPopoverModule,
     FormsModule,
     ReactiveFormsModule,

src-ui/src/app/components/common/preview-popup/preview-popup.component.html

@@ -20,7 +20,7 @@
       } @else {
         @if (requiresPassword()) {
           <div class="w-100 h-100 position-relative">
-            <i-bs width="2em" height="2em" class="position-absolute top-50 start-50 translate-middle" name="file-earmark-lock"></i-bs>
+            <pngx-bs-icon width="2em" height="2em" class="position-absolute top-50 start-50 translate-middle" name="file-earmark-lock"></pngx-bs-icon>
           </div>
         }
         @if (!requiresPassword()) {

src-ui/src/app/components/common/preview-popup/preview-popup.component.spec.ts

@@ -7,7 +7,6 @@ import {
 } from '@angular/common/http'
 import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { By } from '@angular/platform-browser'
-import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { of, throwError } from 'rxjs'
 import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
 import { DocumentService } from 'src/app/services/rest/document.service'
@@ -33,7 +32,6 @@ describe('PreviewPopupComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [NgxBootstrapIconsModule.pick(allIcons)],
       providers: [
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),
@@ -92,7 +90,7 @@ describe('PreviewPopupComponent', () => {
     component.onError({ name: 'PasswordException' })
     fixture.detectChanges()
     expect(component.requiresPassword()).toBeTruthy()
-    expect(fixture.debugElement.query(By.css('i-bs'))).not.toBeNull()
+    expect(fixture.debugElement.query(By.css('pngx-bs-icon'))).not.toBeNull()
   })
 
   it('should fall back to object for non-pdf', () => {

src-ui/src/app/components/common/preview-popup/preview-popup.component.ts

@@ -9,8 +9,8 @@ import {
 } from '@angular/core'
 import { NgbPopover, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'
 import { Options } from '@popperjs/core'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { first, Subject, takeUntil } from 'rxjs'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { Document } from 'src/app/data/document'
 import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
 import { DocumentTitlePipe } from 'src/app/pipes/document-title.pipe'
@@ -29,7 +29,7 @@ import { PdfRenderMode } from '../pdf-viewer/pdf-viewer.types'
     DocumentTitlePipe,
     PngxPdfViewerComponent,
     SafeUrlPipe,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
   ],
 })
 export class PreviewPopupComponent implements OnDestroy {

src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.html

@@ -36,10 +36,10 @@
               <input type="text" class="form-control" formControlName="auth_token" readonly>
               <button type="button" class="btn btn-outline-secondary" (click)="copyAuthToken()" i18n-title title="Copy">
                   @if (!copied()) {
-                    <i-bs width="1em" height="1em" name="clipboard-fill"></i-bs>
+                    <pngx-bs-icon width="1em" height="1em" name="clipboard-fill"></pngx-bs-icon>
                   }
                   @if (copied()) {
-                    <i-bs width="1em" height="1em" name="clipboard-check-fill"></i-bs>
+                    <pngx-bs-icon width="1em" height="1em" name="clipboard-check-fill"></pngx-bs-icon>
                   }
                   <span class="visually-hidden" i18n>Copy</span>
                 </button>
@@ -90,7 +90,7 @@
             <div class="list-group">
               @for (provider of socialAccountProviders(); track provider.name) {
                 <a class="list-group-item list-group-item-action text-primary d-flex align-items-center" href="{{ provider.login_url }}" rel="noopener noreferrer">
-                  {{provider.name}}<i-bs class="pb-1 ms-2" name="box-arrow-up-right"></i-bs>
+                  {{provider.name}}<pngx-bs-icon class="pb-1 ms-2" name="box-arrow-up-right"></pngx-bs-icon>
                 </a>
               }
             </div>
@@ -139,7 +139,7 @@
           <label class="d-block mb-2" i18n>Two-factor Authentication</label>
           @if (recoveryCodes()) {
             <div class="alert alert-warning" role="alert">
-              <i-bs name="exclamation-triangle" class="me-1"></i-bs><ng-container i18n>Recovery codes will not be shown again, make sure to save them.</ng-container>
+              <pngx-bs-icon name="exclamation-triangle" class="me-1"></pngx-bs-icon><ng-container i18n>Recovery codes will not be shown again, make sure to save them.</ng-container>
             </div>
             <div class="d-flex flex-row align-items-start mb-3">
               <ul class="list-group w-50">
@@ -156,10 +156,10 @@
               </ul>
               <button type="button" class="btn btn-sm btn-outline-secondary ms-2" (click)="copyRecoveryCodes()" i18n-title title="Copy">
                 @if (!codesCopied()) {
-                  <i-bs width="1em" height="1em" name="clipboard-fill" class="me-1"></i-bs><span i18n>Copy codes</span>
+                  <pngx-bs-icon width="1em" height="1em" name="clipboard-fill" class="me-1"></pngx-bs-icon><span i18n>Copy codes</span>
                 }
                 @if (codesCopied()) {
-                  <i-bs width="1em" height="1em" name="clipboard-check-fill" class="text-primary me-1"></i-bs><span class="text-primary" i18n>Copied!</span>
+                  <pngx-bs-icon width="1em" height="1em" name="clipboard-check-fill" class="text-primary me-1"></pngx-bs-icon><span class="text-primary" i18n>Copied!</span>
                 }
               </button>
             </div>