diff --git a/alfa-client/libs/binary-file/src/lib/vertical-binary-file-list/vertical-binary-file-list.component.spec.ts b/alfa-client/libs/binary-file/src/lib/vertical-binary-file-list/vertical-binary-file-list.component.spec.ts
index 3e09f912b48db0b7c9301e8c605089512f76170e..0b5f5ce7519423ec4e2848256cd6bb6802adecc8 100644
--- a/alfa-client/libs/binary-file/src/lib/vertical-binary-file-list/vertical-binary-file-list.component.spec.ts
+++ b/alfa-client/libs/binary-file/src/lib/vertical-binary-file-list/vertical-binary-file-list.component.spec.ts
@@ -26,6 +26,7 @@ import { ToEmbeddedResourcesPipe, createStateResource } from '@alfa-client/tech-
 import { getMockComponent } from '@alfa-client/test-utils';
 import { SpinnerComponent } from '@alfa-client/ui';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { AttachmentContainerComponent } from '@ods/system';
 import {
   createBinaryFileListResource,
   createBinaryFileResource,
@@ -45,6 +46,7 @@ describe('VerticalBinaryFileListComponent', () => {
       declarations: [
         VerticalBinaryFileListComponent,
         ToEmbeddedResourcesPipe,
+        MockComponent(AttachmentContainerComponent),
         MockComponent(BinaryFile2ContainerComponent),
         MockComponent(SpinnerComponent),
       ],
diff --git a/alfa-client/libs/design-component/src/index.ts b/alfa-client/libs/design-component/src/index.ts
index 8670320bc61acad5f807315ea595229b26da068d..d2253a1c2db7e06a34b2187ff4ab486ea9a922ea 100644
--- a/alfa-client/libs/design-component/src/index.ts
+++ b/alfa-client/libs/design-component/src/index.ts
@@ -1,4 +1,5 @@
 export * from './lib/button-with-spinner/button-with-spinner.component';
+export * from './lib/download-button/download-button.component';
 export * from './lib/form/file-upload-editor/file-upload-editor.component';
 export * from './lib/form/single-file-upload-editor/single-file-upload-editor.component';
 export * from './lib/form/text-editor/text-editor.component';
diff --git a/alfa-client/libs/design-component/src/lib/download-button/download-button.component.spec.ts b/alfa-client/libs/design-component/src/lib/download-button/download-button.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..0d3a394fa7f68d04004f516dbd9074dc27de8997
--- /dev/null
+++ b/alfa-client/libs/design-component/src/lib/download-button/download-button.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { DownloadButtonComponent } from './download-button.component';
+
+describe('DownloadButtonComponent', () => {
+  let component: DownloadButtonComponent;
+  let fixture: ComponentFixture<DownloadButtonComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [DownloadButtonComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DownloadButtonComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/alfa-client/libs/design-component/src/lib/download-button/download-button.component.ts b/alfa-client/libs/design-component/src/lib/download-button/download-button.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..8c700d497a5c6a7fe3e75c385316a1fa0b0c303b
--- /dev/null
+++ b/alfa-client/libs/design-component/src/lib/download-button/download-button.component.ts
@@ -0,0 +1,26 @@
+import { CommonModule } from '@angular/common';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { ButtonComponent, SaveIconComponent, iconVariants } from '@ods/system';
+import { VariantProps } from 'class-variance-authority';
+
+type IconVariants = VariantProps<typeof iconVariants>;
+
+@Component({
+  selector: 'ods-download-button',
+  standalone: true,
+  imports: [CommonModule, ButtonComponent, SaveIconComponent],
+  template: `<ods-button
+    size="fit"
+    variant="onlyIcon"
+    [dataTestId]="dataTestId"
+    (click)="clickEmitter.emit()"
+  >
+    <ods-save-icon icon [size]="size" class="fill-text"></ods-save-icon>
+  </ods-button>`,
+})
+export class DownloadButtonComponent {
+  @Input() dataTestId: string = '';
+  @Input() size: IconVariants['size'] = 'small';
+
+  @Output() public clickEmitter: EventEmitter<MouseEvent> = new EventEmitter<MouseEvent>();
+}
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 9f7b60a883c3ad40fc3bb29b3bd56d8a058d9197..662fc90c2e4fd49940fd66452f54d5e1c50cb7fa 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -15,6 +15,7 @@ export * from './lib/icons/bescheid-upload-icon/bescheid-upload-icon.component';
 export * from './lib/icons/close-icon/close-icon.component';
 export * from './lib/icons/exclamation-icon/exclamation-icon.component';
 export * from './lib/icons/file-icon/file-icon.component';
+export * from './lib/icons/iconVariants';
 export * from './lib/icons/save-icon/save-icon.component';
 export * from './lib/icons/send-icon/send-icon.component';
 export * from './lib/icons/spinner-icon/spinner-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/attachment-container/attachment-container.stories.ts b/alfa-client/libs/design-system/src/lib/attachment-container/attachment-container.stories.ts
index 2f2aa85fe60dab2e39e454bba85eb6bcedc6516a..f1b9e39b08b56dfd6844ddc148c7d5276a167296 100644
--- a/alfa-client/libs/design-system/src/lib/attachment-container/attachment-container.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/attachment-container/attachment-container.stories.ts
@@ -1,5 +1,7 @@
 import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
 
+import { DownloadButtonComponent } from '../../../../design-component/src/lib/download-button/download-button.component';
+
 import { AttachmentComponent } from '../attachment/attachment.component';
 import { AttachmentContainerComponent } from './attachment-container.component';
 
@@ -15,7 +17,7 @@ const meta: Meta<AttachmentContainerComponent> = {
   },
   decorators: [
     moduleMetadata({
-      imports: [AttachmentContainerComponent, AttachmentComponent],
+      imports: [AttachmentContainerComponent, AttachmentComponent, DownloadButtonComponent],
     }),
   ],
   excludeStories: /.*Data$/,
@@ -37,7 +39,7 @@ export const Default: Story = {
   render: (args) => ({
     props: args,
     template: `<ods-attachment-container ${argsToTemplate(args)}>
-        <p action-buttons>button</p>
+        <ods-download-button action-buttons />
         <ods-attachment caption="Attachment" description="200 kB" fileType="pdf"></ods-attachment>
         <ods-attachment caption="Second attachment" description="432 kB" fileType="doc"></ods-attachment>
     </ods-attachment-container>`,
diff --git a/alfa-client/libs/design-system/src/lib/button/button.component.ts b/alfa-client/libs/design-system/src/lib/button/button.component.ts
index 19d22368fd3dd405970df6c7a77790783ee19d77..6b9e52eeff912cd7967452b3b44798e7cb617936 100644
--- a/alfa-client/libs/design-system/src/lib/button/button.component.ts
+++ b/alfa-client/libs/design-system/src/lib/button/button.component.ts
@@ -5,16 +5,18 @@ import { VariantProps, cva } from 'class-variance-authority';
 import { SpinnerIconComponent } from '../icons/spinner-icon/spinner-icon.component';
 
 export const buttonVariants = cva(
-  'flex cursor-pointer items-center gap-4 rounded-md font-medium disabled:cursor-wait text-sm min-w-32 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-ozgblue-800',
+  'flex cursor-pointer items-center gap-4 rounded-md font-medium disabled:cursor-wait text-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-ozgblue-800',
   {
     variants: {
       variant: {
         primary: 'hover:enabled:bg-primary-hover bg-primary text-white shadow-sm',
         outline:
           'border border-primary bg-background-50 text-primary hover:enabled:bg-background-100',
+        onlyIcon: '',
       },
       size: {
-        medium: 'h-9 py-2 px-4',
+        medium: 'h-9 py-2 px-4 min-w-32',
+        fit: 'w-fit h-fit p-0',
       },
     },
     defaultVariants: {
@@ -40,7 +42,7 @@ type ButtonVariants = VariantProps<typeof buttonVariants>;
   >
     <ng-content *ngIf="!isLoading" select="[icon]"></ng-content>
     <ods-spinner-icon *ngIf="isLoading" size="medium"></ods-spinner-icon>
-    <div class="flex-grow">{{ text }}</div>
+    <div *ngIf="text" class="flex-grow">{{ text }}</div>
   </button>`,
 })
 export class ButtonComponent {
diff --git a/alfa-client/libs/design-system/src/lib/button/button.stories.ts b/alfa-client/libs/design-system/src/lib/button/button.stories.ts
index 5db5e2e20ad61881bf767c822890d900898544ea..9ee8af807d7f85bb508fbe71a8220733b8504c9b 100644
--- a/alfa-client/libs/design-system/src/lib/button/button.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/button/button.stories.ts
@@ -1,6 +1,6 @@
 import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
 
-import { FileIconComponent } from '../icons/file-icon/file-icon.component';
+import { SaveIconComponent } from '../icons/save-icon/save-icon.component';
 import { ButtonComponent } from './button.component';
 
 const meta: Meta<ButtonComponent> = {
@@ -8,7 +8,7 @@ const meta: Meta<ButtonComponent> = {
   component: ButtonComponent,
   decorators: [
     moduleMetadata({
-      imports: [ButtonComponent, FileIconComponent],
+      imports: [ButtonComponent, SaveIconComponent],
     }),
   ],
   excludeStories: /.*Data$/,
@@ -41,7 +41,7 @@ export const WithIcon: Story = {
   render: (args) => ({
     props: args,
     template: `<ods-button ${argsToTemplate(args)}>
-      <ods-file-icon icon fileType='pdf' size='small'></ods-file-icon>
+      <ods-save-icon icon size='small'></ods-save-icon>
     </ods-button>`,
   }),
 };
@@ -52,3 +52,16 @@ export const IsLoading: Story = {
     isLoading: true,
   },
 };
+
+export const OnlyIcon: Story = {
+  args: {
+    variant: 'onlyIcon',
+    size: 'fit',
+  },
+  render: (args) => ({
+    props: args,
+    template: `<ods-button ${argsToTemplate(args)}>
+      <ods-save-icon icon size='medium'></ods-save-icon>
+    </ods-button>`,
+  }),
+};
diff --git a/alfa-client/libs/design-system/src/lib/icons/attachment-icon/attachment-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/attachment-icon/attachment-icon.component.ts
index dea522781c4adc45ddfa582fd86fa7f52f5774f5..30a34056cee8da2a6e01385790c7c8e48cee4431 100644
--- a/alfa-client/libs/design-system/src/lib/icons/attachment-icon/attachment-icon.component.ts
+++ b/alfa-client/libs/design-system/src/lib/icons/attachment-icon/attachment-icon.component.ts
@@ -2,7 +2,7 @@ import { NgClass } from '@angular/common';
 import { Component, Input } from '@angular/core';
 import { twMerge } from 'tailwind-merge';
 
-import { IconVariants, iconVariants } from '../IconClasses';
+import { IconVariants, iconVariants } from '../iconVariants';
 
 @Component({
   selector: 'ods-attachment-icon',
diff --git a/alfa-client/libs/design-system/src/lib/icons/bescheid-generate-icon/bescheid-generate-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/bescheid-generate-icon/bescheid-generate-icon.component.ts
index 3a7f86c81501c7dc5722b5f868bf1c12fa05c615..d9b829b2269a676de6cf15fed9e50e7cdd9081fa 100644
--- a/alfa-client/libs/design-system/src/lib/icons/bescheid-generate-icon/bescheid-generate-icon.component.ts
+++ b/alfa-client/libs/design-system/src/lib/icons/bescheid-generate-icon/bescheid-generate-icon.component.ts
@@ -2,7 +2,7 @@ import { NgClass } from '@angular/common';
 import { Component, Input } from '@angular/core';
 import { twMerge } from 'tailwind-merge';
 
-import { IconVariants, iconVariants } from '../IconClasses';
+import { IconVariants, iconVariants } from '../iconVariants';
 
 @Component({
   selector: 'ods-bescheid-generate-icon',
diff --git a/alfa-client/libs/design-system/src/lib/icons/bescheid-upload-icon/bescheid-upload-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/bescheid-upload-icon/bescheid-upload-icon.component.ts
index 3947b891b5f3d07cd29fd9a6c0f3a2bb9c2f6089..cc265fdbb039365e1eeae63fc69b339578493eba 100644
--- a/alfa-client/libs/design-system/src/lib/icons/bescheid-upload-icon/bescheid-upload-icon.component.ts
+++ b/alfa-client/libs/design-system/src/lib/icons/bescheid-upload-icon/bescheid-upload-icon.component.ts
@@ -2,7 +2,7 @@ import { NgClass } from '@angular/common';
 import { Component, Input } from '@angular/core';
 import { twMerge } from 'tailwind-merge';
 
-import { IconVariants, iconVariants } from '../IconClasses';
+import { IconVariants, iconVariants } from '../iconVariants';
 
 @Component({
   selector: 'ods-bescheid-upload-icon',
diff --git a/alfa-client/libs/design-system/src/lib/icons/close-icon/close-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/close-icon/close-icon.component.ts
index 81c6ce8e91c4ab7fab1ef6e4e9f0bcf6dfc8f7c2..5de688d73e98d67b1296d1519332fd7e3b7c9660 100644
--- a/alfa-client/libs/design-system/src/lib/icons/close-icon/close-icon.component.ts
+++ b/alfa-client/libs/design-system/src/lib/icons/close-icon/close-icon.component.ts
@@ -2,7 +2,7 @@ import { NgClass } from '@angular/common';
 import { Component, Input } from '@angular/core';
 import { twMerge } from 'tailwind-merge';
 
-import { IconVariants, iconVariants } from '../IconClasses';
+import { IconVariants, iconVariants } from '../iconVariants';
 
 @Component({
   selector: 'ods-close-icon',
diff --git a/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.ts
index 9dda95ea08ca28bee431be67e9400e6ccaa6f0ec..c425c77aaa40b0efa0d0e2dd5b14decbad216f5e 100644
--- a/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.ts
+++ b/alfa-client/libs/design-system/src/lib/icons/exclamation-icon/exclamation-icon.component.ts
@@ -2,7 +2,7 @@ import { NgClass } from '@angular/common';
 import { Component, Input } from '@angular/core';
 import { twMerge } from 'tailwind-merge';
 
-import { IconVariants, iconVariants } from '../IconClasses';
+import { IconVariants, iconVariants } from '../iconVariants';
 
 @Component({
   selector: 'ods-exclamation-icon',
diff --git a/alfa-client/libs/design-system/src/lib/icons/IconClasses.ts b/alfa-client/libs/design-system/src/lib/icons/iconVariants.ts
similarity index 100%
rename from alfa-client/libs/design-system/src/lib/icons/IconClasses.ts
rename to alfa-client/libs/design-system/src/lib/icons/iconVariants.ts
diff --git a/alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.component.ts
index 405d1199cd3837498a19164e319107b1b5a706d7..b2d22480f7100aefc09ed77c3d2d499eebef01bf 100644
--- a/alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.component.ts
+++ b/alfa-client/libs/design-system/src/lib/icons/save-icon/save-icon.component.ts
@@ -2,7 +2,7 @@ import { NgClass } from '@angular/common';
 import { Component, Input } from '@angular/core';
 import { twMerge } from 'tailwind-merge';
 
-import { IconVariants, iconVariants } from '../IconClasses';
+import { IconVariants, iconVariants } from '../iconVariants';
 
 @Component({
   selector: 'ods-save-icon',
diff --git a/alfa-client/libs/design-system/src/lib/icons/send-icon/send-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/send-icon/send-icon.component.ts
index 60205dd2942b8c0a47fd75f9ffe699a731c33061..6a34bb7ebb5b3b019a8254bf2f723eb93ac2b58e 100644
--- a/alfa-client/libs/design-system/src/lib/icons/send-icon/send-icon.component.ts
+++ b/alfa-client/libs/design-system/src/lib/icons/send-icon/send-icon.component.ts
@@ -2,7 +2,7 @@ import { NgClass } from '@angular/common';
 import { Component, Input } from '@angular/core';
 import { twMerge } from 'tailwind-merge';
 
-import { IconVariants, iconVariants } from '../IconClasses';
+import { IconVariants, iconVariants } from '../iconVariants';
 
 @Component({
   selector: 'ods-send-icon',
diff --git a/alfa-client/libs/design-system/src/lib/icons/spinner-icon/spinner-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/spinner-icon/spinner-icon.component.ts
index 05aaf8d9aab8a37f8caa3f078f47b9dab1e96117..321829613a72fd018fbadd3b9117c3f16e119cc8 100644
--- a/alfa-client/libs/design-system/src/lib/icons/spinner-icon/spinner-icon.component.ts
+++ b/alfa-client/libs/design-system/src/lib/icons/spinner-icon/spinner-icon.component.ts
@@ -1,7 +1,7 @@
 import { NgClass } from '@angular/common';
 import { Component, Input } from '@angular/core';
 
-import { IconVariants, iconVariants } from '../IconClasses';
+import { IconVariants, iconVariants } from '../iconVariants';
 
 @Component({
   selector: 'ods-spinner-icon',
diff --git a/alfa-client/libs/design-system/src/lib/icons/stamp-icon/stamp-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/stamp-icon/stamp-icon.component.ts
index 7b71c7b5d4dc15511d67441582c2539c7abea06b..26bb89c266ab88212c87bf6b0beba4874843fb2c 100644
--- a/alfa-client/libs/design-system/src/lib/icons/stamp-icon/stamp-icon.component.ts
+++ b/alfa-client/libs/design-system/src/lib/icons/stamp-icon/stamp-icon.component.ts
@@ -2,7 +2,7 @@ import { NgClass } from '@angular/common';
 import { Component, Input } from '@angular/core';
 import { twMerge } from 'tailwind-merge';
 
-import { IconVariants, iconVariants } from '../IconClasses';
+import { IconVariants, iconVariants } from '../iconVariants';
 
 @Component({
   selector: 'ods-stamp-icon',