diff --git a/alfa-client/apps/demo/src/app/app.component.html b/alfa-client/apps/demo/src/app/app.component.html
index 6deed0aed97586faa32e3266ec76f92a1acbab57..38228a23ad800277d75b0135dc37c00545b4b049 100644
--- a/alfa-client/apps/demo/src/app/app.component.html
+++ b/alfa-client/apps/demo/src/app/app.component.html
@@ -16,53 +16,18 @@
     <main class="flex-auto bg-background-50 p-6">
       <form id="antrag_bescheiden_form" [formGroup]="exampleForm">
         <div class="my-10 flex gap-8">
-          <ods-radio-button-card
-            label="bewilligt"
-            name="exampleName"
-            value="bewilligt"
-          >
-            <ozgdesign-stamp-icon />
+          <ods-radio-button-card label="bewilligt" name="exampleName" value="bewilligt">
+            <ods-icon name="stamp" fillColor="green" size="30" />
+          </ods-radio-button-card>
+          <ods-radio-button-card label="abgelehnt" name="exampleName" value="abgelehnt">
+            <ods-icon name="close" fillColor="red" size="30" />
           </ods-radio-button-card>
-          <ods-radio-button-card
-            label="abgelehnt"
-            name="exampleName"
-            value="abgelehnt"
-          >
-            <ozgdesign-close-icon
-          /></ods-radio-button-card>
         </div>
       </form>
       <app-bescheid-dialog-button></app-bescheid-dialog-button>
       <ozgdesign-testbtn />
       <div class="text-warning">Achtung</div>
       <div class="text-primary">Achtung</div>
-      <div class="mt-4 grid grid-cols-2 gap-3">
-        <ods-attachment
-          description="126 kB"
-          documentName="Waffenschein_153481.pdf"
-          [iconArgs]="{ type: 'pdf' }"
-        ></ods-attachment>
-        <ods-attachment
-          description="126 kB"
-          documentName="Waffenschein_1432178.doc"
-          [iconArgs]="{ type: 'doc' }"
-        ></ods-attachment>
-        <ods-attachment
-          description="126 kB"
-          documentName="Katzenmeldung_5678.pdf"
-          [iconArgs]="{ type: 'pdf', isLoading: true }"
-        ></ods-attachment>
-        <ods-attachment
-          description="126 kB"
-          documentName="Waffenschein_142321.pdf"
-          [iconArgs]="{ type: 'pdf', isExclamation: true }"
-        >
-          <ozgdesign-download-icon
-            [isButton]="true"
-            (clickHandler)="onDownloadClick()"
-          ></ozgdesign-download-icon>
-        </ods-attachment>
-      </div>
       <hr class="mt-24" />
       <div>CDK Stepper</div>
       <app-custom-stepper>
diff --git a/alfa-client/apps/demo/src/app/app.component.ts b/alfa-client/apps/demo/src/app/app.component.ts
index fd45ee92349f5cd5a92f1c75777d1d12d52d21ef..67fd4be2eb28509e4995fba7aab6eb2bc0e1ccfc 100644
--- a/alfa-client/apps/demo/src/app/app.component.ts
+++ b/alfa-client/apps/demo/src/app/app.component.ts
@@ -7,9 +7,7 @@ import {
   TestbtnComponent,
   RadioButtonCardComponent,
   AttachmentComponent,
-  DownloadIconComponent,
-  StampIconComponent,
-  CloseIconComponent,
+  IconComponent,
 } from 'design-system';
 import { CustomStepperComponent } from './components/cdk-demo/custom-stepper.component';
 import { BescheidStepperComponent } from './components/bescheid-stepper/bescheid-stepper.component';
@@ -21,7 +19,6 @@ import { BescheidPaperComponent } from './components/bescheid-paper/bescheid-pap
   imports: [
     CommonModule,
     AttachmentComponent,
-    DownloadIconComponent,
     TestbtnComponent,
     RouterModule,
     CdkStepperModule,
@@ -31,8 +28,7 @@ import { BescheidPaperComponent } from './components/bescheid-paper/bescheid-pap
     BescheidPaperComponent,
     RadioButtonCardComponent,
     ReactiveFormsModule,
-    StampIconComponent,
-    CloseIconComponent,
+    IconComponent,
   ],
   selector: 'app-root',
   templateUrl: './app.component.html',
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 15b1df1002784c2809e7ca08f6e11720f949bd33..dd470191ab4869975f5bbd7d7e4c507bfd175f70 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -1,11 +1,6 @@
 export * from './lib/attachment/attachment.component';
 export * from './lib/testbtn/testbtn.component';
-export * from './lib/form/upoad-file-button/file-upload-button.component';
+export * from './lib/form/file-upload-button/file-upload-button.component';
 export * from './lib/form/radio-button-card/radio-button-card.component';
-
-export * from './lib/icons/download-icon/download-icon.component';
-export * from './lib/icons/close-icon/close-icon.component';
-export * from './lib/icons/file-icon/file-icon.component';
-export * from './lib/icons/notice-icon/notice-icon.component';
 export * from './lib/spinner/spinner.component';
-export * from './lib/icons/stamp-icon/stamp-icon.component';
+export * from './lib/icon/icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/form/upoad-file-button/file-upload-button.component.html b/alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.component.html
similarity index 100%
rename from alfa-client/libs/design-system/src/lib/form/upoad-file-button/file-upload-button.component.html
rename to alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.component.html
diff --git a/alfa-client/libs/design-system/src/lib/form/upoad-file-button/file-upload-button.component.spec.ts b/alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.component.spec.ts
similarity index 100%
rename from alfa-client/libs/design-system/src/lib/form/upoad-file-button/file-upload-button.component.spec.ts
rename to alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.component.spec.ts
diff --git a/alfa-client/libs/design-system/src/lib/form/upoad-file-button/file-upload-button.component.ts b/alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.component.ts
similarity index 100%
rename from alfa-client/libs/design-system/src/lib/form/upoad-file-button/file-upload-button.component.ts
rename to alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.component.ts
diff --git a/alfa-client/libs/design-system/src/lib/form/upoad-file-button/file-upload-button.stories.ts b/alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.stories.ts
similarity index 100%
rename from alfa-client/libs/design-system/src/lib/form/upoad-file-button/file-upload-button.stories.ts
rename to alfa-client/libs/design-system/src/lib/form/file-upload-button/file-upload-button.stories.ts