diff --git a/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor-zone-list/ocr-template-editor-zone-list.component.spec.ts b/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor-zone-list/ocr-template-editor-zone-list.component.spec.ts
index b431564662..4a9e830d2a 100644
--- a/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor-zone-list/ocr-template-editor-zone-list.component.spec.ts
+++ b/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor-zone-list/ocr-template-editor-zone-list.component.spec.ts
@@ -1,5 +1,5 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { CustomField } from 'src/app/data/custom-field'
 import {
   OcrTemplateZone,
@@ -32,10 +32,7 @@ describe('OcrTemplateEditorZoneListComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [
-        OcrTemplateEditorZoneListComponent,
-        NgxBootstrapIconsModule.pick(allIcons),
-      ],
+      imports: [OcrTemplateEditorZoneListComponent, BootstrapIconComponent],
     }).compileComponents()
 
     fixture = TestBed.createComponent(OcrTemplateEditorZoneListComponent)
diff --git a/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor-zone-list/ocr-template-editor-zone-list.component.ts b/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor-zone-list/ocr-template-editor-zone-list.component.ts
index 1ee4f90a27..c1a3885b32 100644
--- a/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor-zone-list/ocr-template-editor-zone-list.component.ts
+++ b/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor-zone-list/ocr-template-editor-zone-list.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 { CustomField } from 'src/app/data/custom-field'
 import {
   getZoneFieldKey,
@@ -11,7 +11,7 @@ import { getZoneColor } from '../zone-geometry'
 
 @Component({
   selector: 'pngx-ocr-template-zone-list',
-  imports: [NgxBootstrapIconsModule],
+  imports: [BootstrapIconComponent],
   templateUrl: './ocr-template-editor-zone-list.component.html',
 })
 export class OcrTemplateEditorZoneListComponent {
diff --git a/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.spec.ts b/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.spec.ts
index f2836ffd4d..a87af59ec1 100644
--- a/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.spec.ts
+++ b/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.spec.ts
@@ -4,7 +4,7 @@ import { ElementRef } from '@angular/core'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { By } from '@angular/platform-browser'
 import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'
-import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { of, Subject, throwError } from 'rxjs'
 import { PermissionsFormComponent } from 'src/app/components/common/input/permissions/permissions-form/permissions-form.component'
 import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field'
@@ -73,10 +73,7 @@ describe('OcrTemplateEditorComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [
-        NgxBootstrapIconsModule.pick(allIcons),
-        OcrTemplateEditorComponent,
-      ],
+      imports: [BootstrapIconComponent, OcrTemplateEditorComponent],
       providers: [
         { provide: NgbActiveModal, useValue: activeModal },
         provideHttpClient(withInterceptorsFromDi()),
diff --git a/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.ts b/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.ts
index c81d412020..2b01943853 100644
--- a/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.ts
+++ b/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.ts
@@ -19,7 +19,7 @@ import {
   NgbModal,
   NgbNavModule,
 } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { Subject, takeUntil } from 'rxjs'
 import { CustomFieldEditDialogComponent } from 'src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component'
 import { EditDialogMode } from 'src/app/components/common/edit-dialog/edit-dialog.component'
@@ -153,7 +153,7 @@ const RESIZE_CURSOR: Record<ResizeHandle, string> = {
     CommonModule,
     FormsModule,
     NgbNavModule,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
     OcrTemplateEditorZoneListComponent,
     PermissionsFormComponent,
     IfOwnerDirective,
diff --git a/src-ui/src/app/components/manage/ocr-templates/ocr-templates.component.spec.ts b/src-ui/src/app/components/manage/ocr-templates/ocr-templates.component.spec.ts
index 963aa132df..fac1e60491 100644
--- a/src-ui/src/app/components/manage/ocr-templates/ocr-templates.component.spec.ts
+++ b/src-ui/src/app/components/manage/ocr-templates/ocr-templates.component.spec.ts
@@ -3,7 +3,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { By } from '@angular/platform-browser'
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { of, throwError } from 'rxjs'
 import { MATCH_LITERAL, MATCH_NONE } from 'src/app/data/matching-model'
 import { OcrTemplate } from 'src/app/data/ocr-template'
@@ -16,6 +15,7 @@ import { ToastService } from 'src/app/services/toast.service'
 import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'
 import { OcrTemplateEditorComponent } from './ocr-template-editor/ocr-template-editor.component'
 import { OcrTemplatesComponent } from './ocr-templates.component'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 
 const templates: OcrTemplate[] = [
   {
@@ -41,7 +41,7 @@ describe('OcrTemplatesComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [NgxBootstrapIconsModule.pick(allIcons), OcrTemplatesComponent],
+      imports: [OcrTemplatesComponent, BootstrapIconComponent],
       providers: [
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),
diff --git a/src-ui/src/app/components/manage/ocr-templates/ocr-templates.component.ts b/src-ui/src/app/components/manage/ocr-templates/ocr-templates.component.ts
index f3684c3ab9..02eedb1ad2 100644
--- a/src-ui/src/app/components/manage/ocr-templates/ocr-templates.component.ts
+++ b/src-ui/src/app/components/manage/ocr-templates/ocr-templates.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, inject, signal } from '@angular/core'
 import { FormsModule } from '@angular/forms'
 import { NgbDropdownModule, NgbModal } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component'
 import { firstValueFrom, takeUntil, tap } from 'rxjs'
 import { MATCH_NONE, MATCHING_ALGORITHMS } from 'src/app/data/matching-model'
 import { OcrTemplate } from 'src/app/data/ocr-template'
@@ -27,7 +27,7 @@ import { OcrTemplateEditorComponent } from './ocr-template-editor/ocr-template-e
     IfPermissionsDirective,
     FormsModule,
     NgbDropdownModule,
-    NgxBootstrapIconsModule,
+    BootstrapIconComponent,
   ],
 })
 export class OcrTemplatesComponent