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 32a21b0c8..875566d96 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
@@ -73,8 +73,8 @@ describe('OcrTemplateEditorZoneListComponent', () => {
     expect(
       fixture.nativeElement.querySelectorAll(
         '[title="Combined with other zones"]'
-      ).length
-    ).toBe(2)
+      )
+    ).toHaveLength(2)
   })
 
   it('warns only for zones without a field and clears the warning when assigned', () => {
diff --git a/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.html b/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.html
index 54a645863..788d911b9 100644
--- a/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.html
+++ b/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.html
@@ -190,11 +190,11 @@
             <input class="form-control flex-grow-0 preview-page-input" type="number" min="1" [max]="previewPageCount()" [(ngModel)]="previewPageDisplay" [disabled]="!pageLoaded()" aria-label="Page" i18n-aria-label />
             <span class="input-group-text" i18n>of {{ previewPageCount() ?? '?' }}</span>
           </div>
-          <div class="input-group w-auto flex-nowrap" role="group" aria-label="Zoom" i18n-aria-label>
+          <fieldset class="input-group w-auto flex-nowrap" aria-label="Zoom" i18n-aria-label>
             <button type="button" class="btn btn-outline-secondary" aria-label="Zoom out" i18n-aria-label [disabled]="!pageLoaded() || zoom <= 0.5" (click)="zoomOut()"><i-bs name="dash"></i-bs></button>
             <button type="button" class="btn btn-outline-secondary preview-zoom" title="Reset zoom" i18n-title [disabled]="!pageLoaded()" (click)="resetZoom()">{{ zoom | percent: '1.0-0' }}</button>
             <button type="button" class="btn btn-outline-secondary" aria-label="Zoom in" i18n-aria-label [disabled]="!pageLoaded() || zoom >= 4" (click)="zoomIn()"><i-bs name="plus"></i-bs></button>
-          </div>
+          </fieldset>
         }
       </div>
       <div class="flex-grow-1 overflow-hidden">
@@ -229,6 +229,7 @@
                   (pointerup)="onOverlayPointerUp($event)"
                   (pointercancel)="onOverlayPointerCancel($event)"
                   (lostpointercapture)="onOverlayPointerCancel($event)"
+                  aria-label="Zone overlay" i18n-aria-label
                 >
                   @for (zone of template.zones; track $index; let i = $index) {
                     @if (zoneDisplayRect(i); as rect) {
@@ -281,9 +282,9 @@
             </div>
             @if (!pageLoaded()) {
               <div class="p-5 d-flex justify-content-center align-items-center">
-                <div class="spinner-border" role="status">
+                <output class="spinner-border" role="status">
                   <span class="visually-hidden" i18n>Loading page...</span>
-                </div>
+                </output>
               </div>
             }
           } @else {
diff --git a/src-ui/src/app/components/manage/ocr-templates/ocr-templates.component.html b/src-ui/src/app/components/manage/ocr-templates/ocr-templates.component.html
index 834af215b..086493f47 100644
--- a/src-ui/src/app/components/manage/ocr-templates/ocr-templates.component.html
+++ b/src-ui/src/app/components/manage/ocr-templates/ocr-templates.component.html
@@ -23,7 +23,7 @@
 
   @if (loading() && templates().length === 0) {
     <li class="list-group-item">
-      <div class="spinner-border spinner-border-sm me-2" role="status"></div>
+      <output class="spinner-border spinner-border-sm me-2" role="status"></output>
       <ng-container i18n>Loading...</ng-container>
     </li>
   }