diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 0e0db7fec4bb17c752095b7ca7b992e8b6d66b63..31432b99ab1e203443188c17898fa8e650ccab21 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -45,8 +45,6 @@ export * from './lib/form/textarea/textarea.component';
export * from './lib/forwarding-item/forwarding-item-info/forwarding-item-info.component';
export * from './lib/forwarding-item/forwarding-item.component';
export * from './lib/icon/icon.component';
-export * from './lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.component';
-export * from './lib/icons/discard-vorgang-icon/discard-vorgang-icon.component';
export * from './lib/icons/edit-icon/edit-icon.component';
export * from './lib/icons/error-icon/error-icon.component';
export * from './lib/icons/exclamation-icon/exclamation-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.component.spec.ts
deleted file mode 100644
index badea86a5eec00f55d092e4af752922e9931d6bb..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { DeleteVorgangFinallyIconComponent } from './delete-vorgang-finally-icon.component';
-
-describe('DeleteVorgangFinallyIconComponent', () => {
- let component: DeleteVorgangFinallyIconComponent;
- let fixture: ComponentFixture<DeleteVorgangFinallyIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [DeleteVorgangFinallyIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(DeleteVorgangFinallyIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.component.ts
deleted file mode 100644
index 4d99ed334f3142a16b1e91ff8b4d5664a8c7c4de..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.component.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-delete-vorgang-finally-icon',
- standalone: true,
- imports: [CommonModule],
- template: `<svg
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-primary', class)]"
- aria-hidden="true"
- >
- <path
- fill-rule="evenodd"
- clip-rule="evenodd"
- d="M17.7366 13V3.11101H12.4405L7.74777 8.05811L7.74777 13H5.75V8.05811C5.75 7.49738 5.96112 6.95968 6.3368 6.56365L11.0296 1.61654C11.4041 1.22173 11.9115 1 12.4405 1H17.7366C18.8399 1 19.7344 1.94513 19.7344 3.11101V13H17.7366Z"
- />
- <path
- d="M7.75 20C7.75 19.4477 8.19772 19 8.75 19C9.30228 19 9.75 19.4477 9.75 20C9.75 20.5523 9.30228 21 8.75 21C8.19772 21 7.75 20.5523 7.75 20Z"
- />
- <path
- d="M7.75 20C7.75 19.4477 8.19772 19 8.75 19C9.30228 19 9.75 19.4477 9.75 20C9.75 20.5523 9.30228 21 8.75 21C8.19772 21 7.75 20.5523 7.75 20Z"
- />
- <path
- d="M11.75 21C11.75 20.4477 12.1977 20 12.75 20C13.3023 20 13.75 20.4477 13.75 21V22C13.75 22.5523 13.3023 23 12.75 23C12.1977 23 11.75 22.5523 11.75 22V21Z"
- />
- <path
- d="M11.75 21C11.75 20.4477 12.1977 20 12.75 20C13.3023 20 13.75 20.4477 13.75 21V22C13.75 22.5523 13.3023 23 12.75 23C12.1977 23 11.75 22.5523 11.75 22V21Z"
- />
- <path
- d="M11.75 13C11.75 12.4477 12.1977 12 12.75 12C13.3023 12 13.75 12.4477 13.75 13V17C13.75 17.5523 13.3023 18 12.75 18C12.1977 18 11.75 17.5523 11.75 17V13Z"
- />
- <path
- d="M11.75 13C11.75 12.4477 12.1977 12 12.75 12C13.3023 12 13.75 12.4477 13.75 13V17C13.75 17.5523 13.3023 18 12.75 18C12.1977 18 11.75 17.5523 11.75 17V13Z"
- />
- <path
- d="M7.75 15C7.75 14.4477 8.19772 14 8.75 14C9.30228 14 9.75 14.4477 9.75 15V16C9.75 16.5523 9.30228 17 8.75 17C8.19772 17 7.75 16.5523 7.75 16V15Z"
- />
- <path
- d="M7.75 15C7.75 14.4477 8.19772 14 8.75 14C9.30228 14 9.75 14.4477 9.75 15V16C9.75 16.5523 9.30228 17 8.75 17C8.19772 17 7.75 16.5523 7.75 16V15Z"
- />
- <path
- d="M15.75 20C15.75 19.4477 16.1977 19 16.75 19C17.3023 19 17.75 19.4477 17.75 20V21C17.75 21.5523 17.3023 22 16.75 22C16.1977 22 15.75 21.5523 15.75 21V20Z"
- />
- <path
- d="M15.75 20C15.75 19.4477 16.1977 19 16.75 19C17.3023 19 17.75 19.4477 17.75 20V21C17.75 21.5523 17.3023 22 16.75 22C16.1977 22 15.75 21.5523 15.75 21V20Z"
- />
- <path
- d="M15.75 15C15.75 14.4477 16.1977 14 16.75 14C17.3023 14 17.75 14.4477 17.75 15V16C17.75 16.5523 17.3023 17 16.75 17C16.1977 17 15.75 16.5523 15.75 16V15Z"
- />
- <path
- d="M15.75 15C15.75 14.4477 16.1977 14 16.75 14C17.3023 14 17.75 14.4477 17.75 15V16C17.75 16.5523 17.3023 17 16.75 17C16.1977 17 15.75 16.5523 15.75 16V15Z"
- />
- </svg> `,
-})
-export class DeleteVorgangFinallyIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = '';
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.stories.ts
deleted file mode 100644
index ddb92e8a002c686a14e3d1cdbfe8f39adc154995..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/icons/delete-vorgang-finally-icon/delete-vorgang-finally-icon.stories.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { DeleteVorgangFinallyIconComponent } from './delete-vorgang-finally-icon.component';
-
-const meta: Meta<DeleteVorgangFinallyIconComponent> = {
- title: 'Icons/Delete Vorgang finally icon',
- component: DeleteVorgangFinallyIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<DeleteVorgangFinallyIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.spec.ts
deleted file mode 100644
index 42eed91241f8ca01ee0cb93f12f30a1d95ae608d..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { DiscardVorgangIconComponent } from './discard-vorgang-icon.component';
-
-describe('DiscardVorgangIconComponent', () => {
- let component: DiscardVorgangIconComponent;
- let fixture: ComponentFixture<DiscardVorgangIconComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [DiscardVorgangIconComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(DiscardVorgangIconComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.ts
deleted file mode 100644
index 1cee910facd1e58b08ca945a39ff1267189b5f1e..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.component.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
- selector: 'ods-discard-vorgang-icon',
- standalone: true,
- imports: [CommonModule],
- template: `<svg
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- [ngClass]="[twMerge(iconVariants({ size }), 'fill-primary', class)]"
- aria-hidden="true"
- >
- <path
- d="M12.75 19.4L14.35 21L16.75 18.6286L19.15 21L20.75 19.4L18.3786 17L20.75 14.6L19.15 13L16.75 15.4L14.35 13L12.75 14.6L15.15 17L12.75 19.4Z"
- />
- <path
- fill-rule="evenodd"
- clip-rule="evenodd"
- d="M17 11V3.77384H12.0294L7.625 7.93078L7.625 18.408H10.75V20.1818H7.625C6.58947 20.1818 5.75 19.3876 5.75 18.408V7.93078C5.75 7.4596 5.94815 7.00779 6.30074 6.67501L10.7051 2.51807C11.0566 2.18631 11.5329 2 12.0294 2H17C18.0355 2 18.875 2.79417 18.875 3.77384V11H17Z"
- />
- </svg>`,
-})
-export class DiscardVorgangIconComponent {
- @Input() size: IconVariants['size'] = 'medium';
- @Input() class: string = '';
-
- readonly iconVariants = iconVariants;
- readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.stories.ts
deleted file mode 100644
index 6c73a8fd5973fc24ee0e1464275b9858e004709e..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/icons/discard-vorgang-icon/discard-vorgang-icon.stories.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { DiscardVorgangIconComponent } from './discard-vorgang-icon.component';
-
-const meta: Meta<DiscardVorgangIconComponent> = {
- title: 'Icons/Discard Vorgang icon',
- component: DiscardVorgangIconComponent,
- excludeStories: /.*Data$/,
- tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<DiscardVorgangIconComponent>;
-
-export const Default: Story = {
- args: { size: 'large' },
- argTypes: {
- size: {
- control: 'select',
- options: ['small', 'medium', 'large', 'extra-large', 'full'],
- description: 'Size of icon. Property "full" means 100%',
- table: {
- defaultValue: { summary: 'medium' },
- },
- },
- },
-};
diff --git a/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.html b/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.html
index 0043c92cb761914b2f64040ff4fd817e60eb9dfa..1c9a07a514023c1ffe7958ba974b239d63cbeae8 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.html
+++ b/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.html
@@ -32,7 +32,7 @@
size="fit"
(clickEmitter)="endgueltigLoeschen.emit()"
>
- <ods-delete-vorgang-finally-icon icon class="fill-text" />
+ <ods-icon icon name="delete-vorgang-finally" fill="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
@@ -41,6 +41,6 @@
variant="outline"
(clickEmitter)="endgueltigLoeschen.emit()"
>
- <ods-delete-vorgang-finally-icon icon />
+ <ods-icon icon name="delete-vorgang-finally" />
</ods-button-with-spinner>
}
diff --git a/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.spec.ts b/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.spec.ts
index a2a4b7a68f6cf52c46b9fe237fb0446fe66defc5..75deac820ccc966fdcf8df19fa1ab99ac692743e 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.spec.ts
+++ b/alfa-client/libs/loesch-anforderung/src/lib/endgueltig-loeschen-button-container/endgueltig-loeschen-button/endgueltig-loeschen-button.component.spec.ts
@@ -24,7 +24,7 @@
import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { DeleteVorgangFinallyIconComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent, MockDirective } from 'ng-mocks';
import { EndgueltigLoeschenButtonComponent } from './endgueltig-loeschen-button.component';
@@ -41,7 +41,7 @@ describe('EndgueltigLoeschenButtonComponent', () => {
declarations: [
EndgueltigLoeschenButtonComponent,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(DeleteVorgangFinallyIconComponent),
+ MockComponent(IconComponent),
MockDirective(TooltipDirective),
],
}).compileComponents();
diff --git a/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts b/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts
index ff527cfc478f145690f5a846abb7fbfb1bff33ec..b3de65bde7a96c161de847b607a671a7ac703bbe 100644
--- a/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts
+++ b/alfa-client/libs/loesch-anforderung/src/lib/loesch-anforderung.module.ts
@@ -29,7 +29,7 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ButtonWithSpinnerComponent } from '@ods/component';
import {
- DeleteVorgangFinallyIconComponent,
+ IconComponent,
RequestVorgangDeletionIconComponent,
TooltipDirective,
UndoRequestVorgangDeletionIconComponent,
@@ -51,7 +51,7 @@ import { LoeschenAnfordernButtonComponent } from './loeschen-anfordern-button-co
HasLinkPipe,
RequestVorgangDeletionIconComponent,
ButtonWithSpinnerComponent,
- DeleteVorgangFinallyIconComponent,
+ IconComponent,
UndoRequestVorgangDeletionIconComponent,
TooltipDirective,
],
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
index 0c3fa80c34898018959613c3aaf227b8281219e8..ebd75e2249460c339b0d6b7f133e89bbfa56a106 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
@@ -34,7 +34,7 @@
size="fit"
(clickEmitter)="verwerfen()"
>
- <ods-discard-vorgang-icon icon class="fill-text" />
+ <ods-icon icon name="discard-vorgang" fill="text" />
</ods-button-with-spinner>
} @else {
<ods-button-with-spinner
@@ -44,7 +44,7 @@
variant="outline"
(clickEmitter)="verwerfen()"
>
- <ods-discard-vorgang-icon icon />
+ <ods-icon icon name="discard-vorgang" />
</ods-button-with-spinner>
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts
index 32e09c8c158c73eeed252f39ae3ea824a4b2cfd7..dabf46abb05dd14f9d56726e20ae7301cc21fd0e 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts
@@ -26,7 +26,7 @@ import { mock } from '@alfa-client/test-utils';
import { VorgangCommandService, VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
-import { DiscardVorgangIconComponent, TooltipDirective } from '@ods/system';
+import { IconComponent, TooltipDirective } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
@@ -51,7 +51,7 @@ describe('VerwerfenButtonComponent', () => {
declarations: [
VerwerfenButtonComponent,
MockComponent(ButtonWithSpinnerComponent),
- MockComponent(DiscardVorgangIconComponent),
+ MockComponent(IconComponent),
MockDirective(TooltipDirective),
HasLinkPipe,
],
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index 41fa07bdd0b81a981fb4c4d036b46e6aba64dc5f..38309b9811e6aa74e2c8dd9330e4527e28480bad 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -73,7 +73,6 @@ import {
BescheidStatusTextComponent,
ButtonCardComponent,
ButtonComponent,
- DiscardVorgangIconComponent,
DropdownMenuComponent,
DropdownMenuTextItemComponent,
EditIconComponent,
@@ -199,7 +198,6 @@ const routes: Routes = [
ForwardingButtonContainerComponent,
TooltipDirective,
EditIconComponent,
- DiscardVorgangIconComponent,
MatTabContent,
IconComponent,
],