diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html
index 9bbcdacc9b83231366934d4f47bcf10df08a9445..0b04ceb6fc50d6d98b70f95f7f252c6a62a11252 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/upload-document-button-container/upload-document-button/bescheid-wizard-upload-document-button.component.html
@@ -8,7 +8,7 @@
     data-test-id="bescheid-wizard-upload-document-upload-editor"
   >
     <ods-bescheid-upload-icon icon></ods-bescheid-upload-icon>
-    <ods-spinner-icon spinner size="extra-large" data-test-class="spinner"></ods-spinner-icon>
+    <ods-spinner-icon spinner size="extra-large"></ods-spinner-icon>
     <div text class="text-center">Bescheiddokument hochladen</div>
   </ods-single-file-upload-editor>
 </div>
diff --git a/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.html b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.html
index 13390c19ef1125b52118f34006a74a2d71991833..1bfa1fb53740999476b2e6b342777abec551f000 100644
--- a/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.html
+++ b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.html
@@ -7,7 +7,7 @@
   class="relative w-72"
   data-test-id="binary-file-upload"
 >
-  <ods-spinner-icon spinner size="medium" data-test-class="spinner" />
+  <ods-spinner-icon spinner size="medium" />
   <ods-attachment-icon icon size="medium" />
   <p text class="text-center">{{ label }}</p>
 </ods-file-upload-button>
diff --git a/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html b/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html
index dcb0a589472d44fcff8f5185d7256195405a38aa..ff08ce18e4ad8cc6037b84833bd941f375a6da0f 100644
--- a/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html
+++ b/alfa-client/libs/design-component/src/lib/form/file-upload-editor/file-upload-editor.component.html
@@ -36,7 +36,7 @@
   [isLoading]="uploadInProgress.loading"
   class="relative w-full max-w-72"
 >
-  <ods-spinner-icon spinner size="medium" data-test-class="spinner"/>
+  <ods-spinner-icon spinner size="medium" />
   <ods-attachment-icon icon size="medium" />
   <p text class="text-center">{{ label }}</p>
 </ods-file-upload-button>
diff --git a/alfa-client/libs/design-system/src/lib/attachment/attachment.component.ts b/alfa-client/libs/design-system/src/lib/attachment/attachment.component.ts
index 7c64b40df51a7a3ff1a8ce51115291156ab56783..4eb93a29d39d2af339ffac57f77cb937de08a473 100644
--- a/alfa-client/libs/design-system/src/lib/attachment/attachment.component.ts
+++ b/alfa-client/libs/design-system/src/lib/attachment/attachment.component.ts
@@ -33,15 +33,19 @@ import { SpinnerIconComponent } from '../icons/spinner-icon/spinner-icon.compone
   standalone: true,
   imports: [CommonModule, SpinnerIconComponent, FileIconComponent],
   styles: [':host {@apply flex}'],
-  template: ` <button
+  template: `<button
     class="relative flex w-full items-start gap-3 border-b border-b-grayborder bg-background-100 px-3 py-2 hover:bg-background-200"
     [disabled]="isLoading"
     [attr.aria-disabled]="isLoading"
   >
     <div class="flex-shrink">
-      <ods-file-icon *ngIf="fileType && !isLoading && !hasError" [fileType]="fileType" size="large" />
+      <ods-file-icon
+        *ngIf="fileType && !isLoading && !hasError"
+        [fileType]="fileType"
+        size="large"
+      />
       <ods-file-icon *ngIf="!isLoading && hasError" fileType="exclamation" size="large" />
-      <ods-spinner-icon *ngIf="isLoading && !hasError" size="large" data-test-class="spinner" />
+      <ods-spinner-icon *ngIf="isLoading && !hasError" size="large" />
     </div>
     <div class="flex grow flex-col items-start break-all text-start text-text">
       <p *ngIf="!hasError && !isLoading && caption" class="text-sm">
diff --git a/alfa-client/libs/design-system/src/lib/button-card/button-card.component.ts b/alfa-client/libs/design-system/src/lib/button-card/button-card.component.ts
index b764413ff9b83e5ebd34cd604b5ba99bee740444..2ceda2c4cd117271df12e25b2324e4106fa19245 100644
--- a/alfa-client/libs/design-system/src/lib/button-card/button-card.component.ts
+++ b/alfa-client/libs/design-system/src/lib/button-card/button-card.component.ts
@@ -31,15 +31,15 @@ import { SpinnerIconComponent } from '../icons/spinner-icon/spinner-icon.compone
   standalone: true,
   imports: [CommonModule, SpinnerIconComponent],
   styles: [':host {@apply inline-flex}'],
-  template: ` <button
+  template: `<button
     type="button"
-    class="flex flex-grow items-center justify-center gap-4 rounded-md bg-background-50 py-3 pl-6 pr-6 text-text hover:bg-background-100 focus:outline-none focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-ozgblue-800 disabled:cursor-wait disabled:hover:bg-background-50"
+    class="flex flex-grow items-center justify-center gap-4 rounded-md bg-background-50 py-3 pl-6 pr-6 text-text hover:bg-background-100 focus:outline-none  focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-ozgblue-800 disabled:cursor-wait disabled:hover:bg-background-50"
     [disabled]="isLoading"
     [attr.aria-disabled]="isLoading"
     [attr.aria-label]="getAriaLabel()"
   >
     <ng-content *ngIf="!isLoading" select="[icon]"></ng-content>
-    <ods-spinner-icon *ngIf="isLoading" size="extra-large" class="shrink-0" data-test-class="spinner" />
+    <ods-spinner-icon *ngIf="isLoading" size="extra-large" class="shrink-0" />
     <div class="flex-grow break-all">
       {{ text }}
       <br *ngIf="subText" aria-hidden="true" />