diff --git a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.html b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.html
index 2ac0364135e1ca213ade83de5bb3874c4729c82a..672cb8f71c1d5426b777273eb7d3f2d12239b6b4 100644
--- a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.html
+++ b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.html
@@ -1,6 +1,6 @@
 @if (configurationStateResource.resource | hasLink: configurationLinkRel.SETTING) {
   <ods-nav-item data-test-id="postfach-navigation" caption="Postfach" path="/postfach">
-    <ods-mailbox-icon icon />
+    <ods-icon icon name="mailbox" fill="text" />
   </ods-nav-item>
 }
 @if (configurationStateResource.resource | hasLink: configurationLinkRel.AGGREGATION_MAPPINGS) {
diff --git a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.spec.ts b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.spec.ts
index 83dd6d65dbc4295c2027f703d6a90f765a1bd4e9..bc802c253dfb33ee7ae2b9dff73dca63c84cfce8 100644
--- a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.spec.ts
+++ b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.spec.ts
@@ -2,7 +2,7 @@ import { ConfigurationLinkRel } from '@admin-client/configuration-shared';
 import { createEmptyStateResource, createStateResource, HasLinkPipe } from '@alfa-client/tech-shared';
 import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { IconComponent, MailboxIconComponent, NavItemComponent } from '@ods/system';
+import { IconComponent, NavItemComponent } from '@ods/system';
 import { createConfigurationResource } from 'libs/admin/configuration-shared/test/configuration';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
 import { MockComponent } from 'ng-mocks';
@@ -18,7 +18,7 @@ describe('MenuComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [MenuComponent, HasLinkPipe],
-      declarations: [MockComponent(NavItemComponent), MockComponent(MailboxIconComponent), MockComponent(IconComponent)],
+      declarations: [MockComponent(NavItemComponent), MockComponent(IconComponent)],
     }).compileComponents();
 
     fixture = TestBed.createComponent(MenuComponent);
diff --git a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.ts b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.ts
index 4a0299181569b996c8c557c85c3f4f5d6b309170..ad10332330c6af03140a8e15f63c4682504d211a 100644
--- a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.ts
+++ b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.ts
@@ -3,12 +3,12 @@ import { ROUTES } from '@admin-client/shared';
 import { HasLinkPipe, StateResource } from '@alfa-client/tech-shared';
 import { CommonModule } from '@angular/common';
 import { Component, Input } from '@angular/core';
-import { IconComponent, MailboxIconComponent, NavItemComponent } from '@ods/system';
+import { IconComponent, NavItemComponent } from '@ods/system';
 
 @Component({
   selector: 'admin-menu',
   standalone: true,
-  imports: [CommonModule, NavItemComponent, MailboxIconComponent, IconComponent, HasLinkPipe],
+  imports: [CommonModule, NavItemComponent, IconComponent, HasLinkPipe],
   templateUrl: './menu.component.html',
 })
 export class MenuComponent {
diff --git a/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.html b/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.html
index a09af6b607a48ed6e0bf6bddec4dedae9a1ebd46..29819104c66503a1da2346f5d5c9d127f4e6c530 100644
--- a/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.html
+++ b/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.html
@@ -2,7 +2,7 @@
   <div *ngIf="user.email" class="flex items-center gap-2">
     <dt>
       <span class="sr-only">E-Mail:</span>
-      <ods-mailbox-icon size="small" class="stroke-gray-600" />
+      <ods-icon name="mailbox" size="small" class="fill-gray-600" />
     </dt>
     <dd data-test-class="email">{{ user.email }}</dd>
   </div>
diff --git a/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.spec.ts b/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.spec.ts
index 1e7e38f5986de68deb361d2346d85575fe3b1e2f..01d7d4efb6df28b92ab65af372500a6e3594e725 100644
--- a/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.spec.ts
+++ b/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.spec.ts
@@ -1,4 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { IconComponent } from '@ods/system';
+import { MockComponent } from 'ng-mocks';
 import { createUser } from '../../../../../../../user-shared/test/user';
 import { UserDataComponent } from './user-data.component';
 
@@ -8,7 +10,7 @@ describe('UserDataComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [UserDataComponent],
+      imports: [UserDataComponent, MockComponent(IconComponent)],
     }).compileComponents();
 
     fixture = TestBed.createComponent(UserDataComponent);
diff --git a/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.ts b/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.ts
index 06483d8051e1c29deb922fad3acd5e35e8a45c55..64e255cf1df7d7e23974b5a43f576721bd38227f 100644
--- a/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.ts
+++ b/alfa-client/libs/admin/user/src/lib/user-list-container/user-list/user/user-data/user-data.component.ts
@@ -1,12 +1,12 @@
 import { User } from '@admin-client/user-shared';
 import { NgIf } from '@angular/common';
 import { Component, Input } from '@angular/core';
-import { MailboxIconComponent, PersonIconComponent } from '@ods/system';
+import { IconComponent, PersonIconComponent } from '@ods/system';
 
 @Component({
   selector: 'admin-user-data',
   standalone: true,
-  imports: [MailboxIconComponent, NgIf, PersonIconComponent],
+  imports: [IconComponent, NgIf, PersonIconComponent],
   templateUrl: './user-data.component.html',
 })
 export class UserDataComponent {
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.html b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.html
index bba37e15e6bf9d17bd1f775c7e14bfac3697c4f8..5f062757f3f19f0e33095b3563d853b517d46a56 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.html
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.html
@@ -37,7 +37,7 @@
 </ng-container>
 <ng-template #anfrageErstellenButton>
   <div class="flex flex-1 gap-3 border border-grayborder bg-background-100 p-4 shadow shadow-grayborder">
-    <ods-external-unit-icon />
+    <ods-icon name="external-unit" size="unset" />
     <div class="flex flex-1 flex-col text-base">
       <p class="text-primary">Externe Fachstelle</p>
       <p class="text-text">Private Organisation, Verein, Schule</p>
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.spec.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.spec.ts
index b886ae38b6cb16da3e8e5e68f4d94d909b022f0a..3a7d082b2fa482ee84e394ec250e64c4e8da25d1 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.spec.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang/externe-fachstelle-container/externe-fachstelle-container.component.spec.ts
@@ -37,7 +37,7 @@ import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-cli
 import { SearchExterneFachstelleContainerComponent } from '@alfa-client/zustaendige-stelle';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormBuilder } from '@angular/forms';
-import { ExternalUnitIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
 import { CollaborationService } from 'libs/collaboration-shared/src/lib/collaboration.service';
 import { createCollaborationListResource } from 'libs/collaboration-shared/test/collaboration';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
@@ -87,7 +87,7 @@ describe('ExterneFachstelleContainerComponent', () => {
         MockComponent(SearchExterneFachstelleContainerComponent),
         MockComponent(CollaborationRequestFormComponent),
         MockComponent(AnfrageErstellenButtonComponent),
-        MockComponent(ExternalUnitIconComponent),
+        MockComponent(IconComponent),
       ],
       providers: [
         {
diff --git a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
index 1e1915c517d874bbcfec09dbd47ceaf674e11ca7..6078fdee089aef4c3959d2f32d681319ac8663ae 100644
--- a/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
+++ b/alfa-client/libs/collaboration/src/lib/collaboration.module.ts
@@ -29,7 +29,7 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { ButtonWithSpinnerComponent, TextEditorComponent, TextareaEditorComponent } from '@ods/component';
-import { ButtonComponent, ExternalUnitIconComponent, IconComponent, PublicAdministrationIconComponent } from '@ods/system';
+import { ButtonComponent, IconComponent, PublicAdministrationIconComponent } from '@ods/system';
 import { ExterneFachstelleListItemContainerComponent } from 'libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component';
 import { OrganisationsEinheitListItemContainerComponent } from 'libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item-container.component';
 import { CollaborationInVorgangContainerComponent } from './collaboration-in-vorgang-container/collaboration-in-vorgang-container.component';
@@ -53,7 +53,6 @@ import { CollaborationRequestFormComponent } from './collaboration-in-vorgang-co
     ReactiveFormsModule,
     ButtonWithSpinnerComponent,
     ZustaendigeStelleModule,
-    ExternalUnitIconComponent,
     PublicAdministrationIconComponent,
     OrganisationsEinheitListItemContainerComponent,
     ExterneFachstelleListItemContainerComponent,
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index 895513a35dc269fcf541192b09add4bd0ff4468f..0508336b2160044aa4f8d358248a3e2444be1f80 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -45,10 +45,8 @@ 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/external-unit-icon/external-unit-icon.component';
 export * from './lib/icons/file-icon/file-icon.component';
 export * from './lib/icons/iconVariants';
-export * from './lib/icons/mailbox-icon/mailbox-icon.component';
 export * from './lib/icons/ozg-logo-icon/ozg-logo-icon.component';
 export * from './lib/icons/person-icon/person-icon.component';
 export * from './lib/icons/public-administration-icon/public-administration-icon.component';
diff --git a/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.html b/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.html
deleted file mode 100644
index 21c59c0b92758a6f468a683e3549fbf2a9835d0f..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!--
-
-    Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
-    Ministerpräsidenten des Landes Schleswig-Holstein
-    Staatskanzlei
-    Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
-
-    Lizenziert unter der EUPL, Version 1.2 oder - sobald
-    diese von der Europäischen Kommission genehmigt wurden -
-    Folgeversionen der EUPL ("Lizenz");
-    Sie dürfen dieses Werk ausschließlich gemäß
-    dieser Lizenz nutzen.
-    Eine Kopie der Lizenz finden Sie hier:
-
-    https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
-
-    Sofern nicht durch anwendbare Rechtsvorschriften
-    gefordert oder in schriftlicher Form vereinbart, wird
-    die unter der Lizenz verbreitete Software "so wie sie
-    ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
-    ausdrücklich oder stillschweigend - verbreitet.
-    Die sprachspezifischen Genehmigungen und Beschränkungen
-    unter der Lizenz sind dem Lizenztext zu entnehmen.
-
--->
-<svg width="45" height="37" viewBox="0 0 45 37" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <g [ngClass]="[twMerge('fill-primary', class)]">
-    <path
-      d="M9.13165 9.58598H8.85322V8.76559C8.85322 8.61465 8.72877 8.49214 8.57479 8.49214C8.42081 8.49214 8.29636 8.61465 8.29636 8.76559V9.85943C8.29636 10.0104 8.42081 10.1329 8.57479 10.1329H9.13169C9.28567 10.1329 9.41012 10.0104 9.41012 9.85943C9.41012 9.70849 9.28563 9.58598 9.13165 9.58598Z"
-    />
-    <path
-      d="M3.56334 16.6978H2.44898C2.29492 16.6978 2.17041 16.8203 2.17041 16.9712V18.6121C2.17041 18.763 2.29492 18.8855 2.44898 18.8855H3.56331C3.71737 18.8855 3.84188 18.763 3.84188 18.6121V16.9712C3.84191 16.8203 3.7174 16.6978 3.56334 16.6978ZM3.28473 18.3386H2.72759V17.2447H3.28477L3.28473 18.3386Z"
-    />
-    <path
-      d="M3.84191 13.69C3.84191 13.5391 3.7174 13.4166 3.56334 13.4166H2.44898C2.29492 13.4166 2.17041 13.5391 2.17041 13.69V15.3309C2.17041 15.4818 2.29492 15.6043 2.44898 15.6043H3.56331C3.71737 15.6043 3.84188 15.4818 3.84188 15.3309L3.84191 13.69ZM3.28473 15.0574H2.72759V13.9635H3.28477L3.28473 15.0574Z"
-    />
-    <path
-      d="M4.40016 12.0495C4.40016 11.8985 4.27565 11.776 4.12159 11.776H1.05715V11.5026C1.05715 11.3516 0.932633 11.2291 0.778574 11.2291C0.624514 11.2291 0.5 11.3516 0.5 11.5026V20.8005C0.5 21.2528 0.874979 21.6209 1.33575 21.6209H3.56444C4.02521 21.6209 4.40019 21.2528 4.40019 20.8005C4.40019 20.3482 4.02521 19.9801 3.56444 19.9801C3.51625 19.9801 3.46833 19.9842 3.42125 19.9924C3.22932 19.6525 2.86296 19.4332 2.45011 19.4332C2.03726 19.4332 1.6709 19.6525 1.47897 19.9924C1.4319 19.9842 1.38397 19.9801 1.33579 19.9801C1.23745 19.9801 1.14467 19.9998 1.05721 20.0304V12.323H4.12165C4.27561 12.323 4.40016 12.2005 4.40016 12.0495ZM1.33572 20.5271C1.38893 20.5271 1.4399 20.5421 1.48671 20.5716C1.56278 20.62 1.65833 20.6288 1.74247 20.5952C1.8266 20.5618 1.88843 20.4902 1.90935 20.4035C1.96786 20.1543 2.19018 19.9801 2.45008 19.9801C2.70998 19.9801 2.93204 20.1543 2.99081 20.4035C3.0117 20.4902 3.07353 20.5618 3.1577 20.5952C3.24183 20.6288 3.33709 20.6201 3.41345 20.5716C3.5951 20.4568 3.84301 20.5973 3.84301 20.8005C3.84301 20.9512 3.71821 21.074 3.56444 21.074H1.33572C1.18196 21.074 1.05715 20.9512 1.05715 20.8005C1.05715 20.6498 1.18196 20.5271 1.33572 20.5271Z"
-    />
-    <path
-      d="M12.4807 20.525H5.23751C5.08345 20.525 4.95894 20.6476 4.95894 20.7986V21.3458C4.95894 21.4968 5.08345 21.6194 5.23751 21.6194C5.39157 21.6194 5.51608 21.4968 5.51608 21.3458V21.0722H12.2021V21.3458C12.2021 21.4968 12.3266 21.6194 12.4807 21.6194C12.6347 21.6194 12.7593 21.4968 12.7593 21.3458V20.7986C12.7593 20.6476 12.6347 20.525 12.4807 20.525Z"
-    />
-    <path
-      d="M5.23751 19.9765C5.39157 19.9765 5.51608 19.854 5.51608 19.703V9.03772C5.51608 8.88677 5.39157 8.76426 5.23751 8.76426C5.08345 8.76426 4.95894 8.88677 4.95894 9.03772V19.703C4.95891 19.854 5.08345 19.9765 5.23751 19.9765Z"
-    />
-    <path
-      d="M12.4816 8.49214C12.3275 8.49214 12.203 8.61466 12.203 8.7656V19.7044C12.203 19.8553 12.3275 19.9778 12.4816 19.9778C12.6357 19.9778 12.7602 19.8553 12.7602 19.7044V8.7656C12.7602 8.61466 12.6357 8.49214 12.4816 8.49214Z"
-    />
-    <path
-      d="M16.9258 11.2291C16.7717 11.2291 16.6472 11.3516 16.6472 11.5026V11.776H13.5828C13.4287 11.776 13.3042 11.8985 13.3042 12.0495C13.3042 12.2004 13.4287 12.3229 13.5828 12.3229H16.6472V20.0304C16.5595 19.9998 16.4667 19.9801 16.3686 19.9801C16.3205 19.9801 16.2725 19.9842 16.2254 19.9924C16.0335 19.6525 15.6672 19.4331 15.2543 19.4331C14.8415 19.4331 14.4751 19.6525 14.2832 19.9924C14.2361 19.9842 14.1882 19.9801 14.14 19.9801C13.6792 19.9801 13.3042 20.3482 13.3042 20.8005C13.3042 21.2528 13.6792 21.6209 14.14 21.6209H16.3687C16.8294 21.6209 17.2044 21.2528 17.2044 20.8005V11.5026C17.2044 11.3516 17.0798 11.2291 16.9258 11.2291ZM16.3686 21.074H14.1399C13.9862 21.074 13.8613 20.9512 13.8613 20.8006C13.8613 20.6499 13.9862 20.5271 14.1399 20.5271C14.1931 20.5271 14.2441 20.5421 14.2909 20.5717C14.3672 20.6201 14.4625 20.6288 14.5467 20.5952C14.6308 20.5618 14.6926 20.4902 14.7135 20.4035C14.772 20.1544 14.9943 19.9802 15.2542 19.9802C15.5142 19.9802 15.7362 20.1544 15.795 20.4035C15.8159 20.4902 15.8777 20.5618 15.9618 20.5952C16.046 20.6289 16.1412 20.6201 16.2176 20.5717C16.3995 20.4568 16.6471 20.5974 16.6471 20.8006C16.6472 20.9512 16.5224 21.074 16.3686 21.074Z"
-    />
-    <path
-      d="M13.1829 7.71134L9.00411 5.25012C8.9158 5.19788 8.80549 5.19788 8.71718 5.25012L4.53841 7.71134C4.40665 7.78899 4.36375 7.95692 4.44315 8.08655C4.52225 8.21589 4.69303 8.258 4.82538 8.18007L8.86066 5.80335L12.8959 8.18007C12.9408 8.2066 12.9904 8.21916 13.0391 8.21916C13.1338 8.21916 13.2261 8.17186 13.2782 8.08652C13.3575 7.95692 13.3146 7.78903 13.1829 7.71134Z"
-    />
-    <path
-      d="M13.8734 18.6121C13.8734 18.763 13.9979 18.8855 14.152 18.8855H15.2663C15.4204 18.8855 15.5449 18.763 15.5449 18.6121V16.9712C15.5449 16.8203 15.4204 16.6978 15.2663 16.6978H14.152C13.9979 16.6978 13.8734 16.8203 13.8734 16.9712V18.6121ZM14.4306 17.2447H14.9878V18.3386H14.4306V17.2447Z"
-    />
-    <path
-      d="M14.152 15.6043H15.2663C15.4204 15.6043 15.5449 15.4818 15.5449 15.3309V13.69C15.5449 13.5391 15.4204 13.4166 15.2663 13.4166H14.152C13.9979 13.4166 13.8734 13.5391 13.8734 13.69V15.3309C13.8734 15.4818 13.9979 15.6043 14.152 15.6043ZM14.4306 13.9635H14.9878V15.0574H14.4306V13.9635Z"
-    />
-    <path
-      d="M8.64818 18.4117C8.59777 18.4636 8.56742 18.532 8.56742 18.6058C8.56742 18.6769 8.59777 18.748 8.64818 18.8C8.70082 18.8492 8.77041 18.8793 8.84589 18.8793C8.91829 18.8793 8.9904 18.8492 9.04359 18.8C9.09371 18.748 9.12435 18.6769 9.12435 18.6058C9.12435 18.532 9.09371 18.4636 9.04359 18.4117C8.94055 18.3105 8.74816 18.3105 8.64818 18.4117Z"
-    />
-    <path
-      d="M6.62596 15.3309C6.62596 15.4818 6.75047 15.6043 6.90453 15.6043H8.01886C8.17292 15.6043 8.29743 15.4818 8.29743 15.3309V13.69C8.29743 13.5391 8.17292 13.4166 8.01886 13.4166H6.90453C6.75047 13.4166 6.62596 13.5391 6.62596 13.69V15.3309ZM7.18314 13.9635H7.74032V15.0574H7.18314V13.9635Z"
-    />
-    <path
-      d="M9.69306 13.4166C9.539 13.4166 9.41449 13.5391 9.41449 13.69V15.3309C9.41449 15.4818 9.539 15.6043 9.69306 15.6043H10.8074C10.9614 15.6043 11.086 15.4818 11.086 15.3309V13.69C11.086 13.5391 10.9614 13.4166 10.8074 13.4166H9.69306ZM10.5288 15.0574H9.97163V13.9635H10.5288V15.0574Z"
-    />
-    <path
-      d="M8.85464 7.40016C7.62579 7.40016 6.62596 8.38164 6.62596 9.58793C6.62596 10.7942 7.62579 11.7757 8.85464 11.7757C10.0835 11.7757 11.0833 10.7942 11.0833 9.58793C11.0833 8.38164 10.0835 7.40016 8.85464 7.40016ZM8.85464 11.2287C7.9328 11.2287 7.18314 10.4928 7.18314 9.5879C7.18314 8.68298 7.9328 7.94708 8.85464 7.94708C9.77649 7.94708 10.5261 8.68298 10.5261 9.5879C10.5261 10.4928 9.77649 11.2287 8.85464 11.2287Z"
-    />
-    <path
-      d="M6.07367 16.9712C6.07367 17.1222 6.19819 17.2447 6.35225 17.2447H7.188V19.7059C7.188 19.8569 7.31251 19.9794 7.46657 19.9794C7.62063 19.9794 7.74515 19.8569 7.74515 19.7059V17.2447H9.97383V19.7059C9.97383 19.8569 10.0983 19.9794 10.2524 19.9794C10.4065 19.9794 10.531 19.8569 10.531 19.7059V17.2447H11.3667C11.5208 17.2447 11.6453 17.1222 11.6453 16.9712C11.6453 16.8203 11.5208 16.6978 11.3667 16.6978H6.35221C6.19819 16.6978 6.07367 16.8203 6.07367 16.9712Z"
-    />
-    <path
-      d="M21.1445 28V27.1651C21.1445 26.5194 21.481 25.9821 22.1541 25.5532C22.8271 25.1244 23.6984 24.9099 24.7679 24.9099C24.9151 24.9099 25.0813 24.9181 25.2663 24.9345C25.4514 24.951 25.6413 24.9746 25.8359 25.0053C25.7352 25.285 25.6563 25.562 25.5991 25.8361C25.542 26.1102 25.5134 26.3844 25.5134 26.6587V28H21.1445ZM27.514 28V26.7447C27.514 26.295 27.6382 25.8839 27.8866 25.5114C28.135 25.139 28.5014 24.8169 28.9858 24.545C29.4704 24.2733 30.0349 24.0695 30.6793 23.9336C31.3237 23.7976 32.0351 23.7296 32.8136 23.7296C33.6071 23.7296 34.3261 23.7976 34.9704 23.9336C35.6148 24.0695 36.1793 24.2733 36.6639 24.545C37.1483 24.8169 37.5138 25.139 37.7602 25.5114C38.0065 25.8839 38.1297 26.295 38.1297 26.7447V28H27.514ZM40.1302 28V26.6652C40.1302 26.3661 40.106 26.0775 40.0577 25.7993C40.0094 25.521 39.9281 25.257 39.8138 25.0073C40.0357 24.9753 40.2353 24.951 40.4126 24.9345C40.5898 24.9181 40.7544 24.9099 40.9062 24.9099C41.9778 24.9099 42.8446 25.1202 43.5065 25.5407C44.1682 25.9613 44.4991 26.5028 44.4991 27.1651V28H40.1302ZM28.3101 27.1416H37.3335V26.8239C37.3743 26.1501 36.9855 25.609 36.1668 25.2006C35.3482 24.7922 34.2332 24.588 32.8218 24.588C31.4241 24.588 30.3125 24.7922 29.4871 25.2006C28.6616 25.609 28.2693 26.1522 28.3101 26.8303V27.1416ZM24.7411 23.9871C24.3618 23.9871 24.0384 23.8447 23.7709 23.5597C23.5035 23.2748 23.3698 22.9309 23.3698 22.5279C23.3698 22.1317 23.5054 21.7931 23.7764 21.5119C24.0475 21.2307 24.3746 21.0901 24.7579 21.0901C25.1349 21.0901 25.4605 21.2307 25.7348 21.5119C26.009 21.7931 26.1461 22.138 26.1461 22.5465C26.1461 22.9304 26.0127 23.2665 25.7459 23.5547C25.4793 23.843 25.1444 23.9871 24.7411 23.9871ZM40.8945 23.9871C40.5253 23.9871 40.2035 23.8424 39.9293 23.553C39.655 23.2637 39.5179 22.9241 39.5179 22.5343C39.5179 22.1339 39.6556 21.7931 39.9309 21.5119C40.2062 21.2307 40.5325 21.0901 40.9099 21.0901C41.2979 21.0901 41.6257 21.2307 41.8932 21.5119C42.1605 21.7931 42.2942 22.1358 42.2942 22.5401C42.2942 22.9372 42.1613 23.2776 41.8956 23.5614C41.6298 23.8452 41.2961 23.9871 40.8945 23.9871ZM32.829 22.8927C32.1846 22.8927 31.6344 22.6549 31.1785 22.1792C30.7225 21.7036 30.4946 21.1261 30.4946 20.4465C30.4946 19.7534 30.7208 19.1724 31.1732 18.7035C31.6258 18.2345 32.1753 18 32.8218 18C33.4812 18 34.0339 18.2338 34.48 18.7013C34.926 19.1687 35.149 19.7479 35.149 20.439C35.149 21.1163 34.9267 21.6946 34.4821 22.1739C34.0375 22.6531 33.4864 22.8927 32.829 22.8927ZM32.8414 22.0344C33.2611 22.0344 33.6145 21.8802 33.9017 21.5718C34.1888 21.2635 34.3324 20.8815 34.3324 20.4259C34.3324 19.9847 34.1884 19.6132 33.9004 19.3111C33.6123 19.0093 33.2559 18.8584 32.8311 18.8584C32.4098 18.8584 32.0512 19.0098 31.7552 19.3128C31.4592 19.6156 31.3112 19.9902 31.3112 20.4367C31.3112 20.8796 31.4579 21.2565 31.7512 21.5677C32.0446 21.8788 32.408 22.0344 32.8414 22.0344Z"
-    />
-  </g>
-  <g [ngClass]="[twMerge('stroke-primary', class)]">
-    <path
-      d="M7.76319 23.4211C7.77138 26.1365 8.70174 28.7709 10.3957 30.8753C12.0897 32.9797 14.4426 34.424 17.0533 34.9621C19.6641 35.5001 22.3712 35.0986 24.7135 33.826C25.8548 33.206 26.875 32.3978 27.7381 31.4423M4.54687 28.2841L7.4063 23.2109L12.3942 26.1609"
-      stroke-width="2"
-      stroke-linejoin="round"
-    />
-    <path
-      d="M33.5608 12.7737C33.5526 10.0582 32.6223 7.42389 30.9283 5.31947C29.2343 3.21505 26.8815 1.77077 24.2707 1.23273C21.6599 0.694683 18.9528 1.09616 16.6105 2.36875C15.4692 2.98879 14.449 3.79695 13.5859 4.75251M36.7772 7.91068L33.9177 12.9838L28.9298 10.0338"
-      stroke-width="2"
-      stroke-linejoin="round"
-    />
-  </g>
-</svg>
diff --git a/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.spec.ts
deleted file mode 100644
index 7fb5c999de224254f44769edba502e28269a8bf4..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ExternalUnitIconComponent } from './external-unit-icon.component';
-
-describe('ExternalUnitIconComponent', () => {
-  let component: ExternalUnitIconComponent;
-  let fixture: ComponentFixture<ExternalUnitIconComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [ExternalUnitIconComponent],
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(ExternalUnitIconComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.ts
deleted file mode 100644
index 46a6ad95d151bb0da56e94d0efd6aa401956de14..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.component.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-
-@Component({
-  selector: 'ods-external-unit-icon',
-  standalone: true,
-  imports: [CommonModule],
-  templateUrl: './external-unit-icon.component.html',
-})
-export class ExternalUnitIconComponent {
-  @Input() class: string = undefined;
-
-  readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.stories.ts
deleted file mode 100644
index c90341e69bea02bff3d7bbd77e69b5c84ba6e68a..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/icons/external-unit-icon/external-unit-icon.stories.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { ExternalUnitIconComponent } from './external-unit-icon.component';
-
-const meta: Meta<ExternalUnitIconComponent> = {
-  title: 'Icons/External unit icon',
-  component: ExternalUnitIconComponent,
-  excludeStories: /.*Data$/,
-  tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<ExternalUnitIconComponent>;
-
-export const Default: Story = {};
diff --git a/alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.component.spec.ts b/alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.component.spec.ts
deleted file mode 100644
index eb5ef248938cd3b186f82963ba4030f768cb5dfd..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.component.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MailboxIconComponent } from './mailbox-icon.component';
-
-describe('MailboxIconComponent', () => {
-  let component: MailboxIconComponent;
-  let fixture: ComponentFixture<MailboxIconComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [MailboxIconComponent],
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(MailboxIconComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.component.ts
deleted file mode 100644
index 87f8cf2610fea69ec9ea0150aa02053586cacdfc..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.component.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import { NgClass } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { twMerge } from 'tailwind-merge';
-import { IconVariants, iconVariants } from '../iconVariants';
-
-@Component({
-  selector: 'ods-mailbox-icon',
-  standalone: true,
-  imports: [NgClass],
-  template: `<svg
-    viewBox="0 0 24 24"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    [ngClass]="twMerge(iconVariants({ size }), 'stroke-text', class)"
-  >
-    <path
-      d="M20 4H4C2.89543 4 2 4.89543 2 6V18C2 19.1046 2.89543 20 4 20H20C21.1046 20 22 19.1046 22 18V6C22 4.89543 21.1046 4 20 4Z"
-      stroke-width="2"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-    />
-    <path
-      d="M22 7L13.03 12.7C12.7213 12.8934 12.3643 12.996 12 12.996C11.6357 12.996 11.2787 12.8934 10.97 12.7L2 7"
-      stroke-width="2"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-    />
-  </svg>`,
-})
-export class MailboxIconComponent {
-  @Input() size: IconVariants['size'] = 'medium';
-  @Input() class: string = undefined;
-
-  readonly iconVariants = iconVariants;
-  readonly twMerge = twMerge;
-}
diff --git a/alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.stories.ts
deleted file mode 100644
index 975bf8afb5bf6934c0211a04700045c2923740ee..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/icons/mailbox-icon/mailbox-icon.stories.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-import type { Meta, StoryObj } from '@storybook/angular';
-
-import { MailboxIconComponent } from './mailbox-icon.component';
-
-const meta: Meta<MailboxIconComponent> = {
-  title: 'Icons/Mailbox icon',
-  component: MailboxIconComponent,
-  excludeStories: /.*Data$/,
-  tags: ['autodocs'],
-};
-
-export default meta;
-type Story = StoryObj<MailboxIconComponent>;
-
-export const Default: Story = {
-  args: { size: 'medium' },
-  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/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component.spec.ts b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component.spec.ts
index 59dd77af3d642aaa2173926fa4366d7ba6ae9c54..5369dceefd1601c0abe122404440a34b01ada804 100644
--- a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component.spec.ts
+++ b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item-container.component.spec.ts
@@ -27,8 +27,10 @@ import { ExterneFachstelleResourceService } from '@alfa-client/externe-fachstell
 import { createStateResource } from '@alfa-client/tech-shared';
 import { mock, Mock } from '@alfa-client/test-utils';
 import { createExterneFachstelle } from 'libs/zustaendige-stelle-shared/test/externe-fachstelle';
+import { MockComponent } from 'ng-mocks';
 import { of } from 'rxjs';
 import { ExterneFachstelleListItemContainerComponent } from './externe-fachstelle-list-item-container.component';
+import { ExterneFachstelleListItemComponent } from './externe-fachstelle-list-item/externe-fachstelle-list-item.component';
 
 describe('ExterneFachstelleListItemContainerComponent', () => {
   let component: ExterneFachstelleListItemContainerComponent;
@@ -45,7 +47,9 @@ describe('ExterneFachstelleListItemContainerComponent', () => {
       getExterneFachstelle: jest.fn().mockReturnValue(of(externeFachstelleStateResource)),
     };
 
-    await TestBed.configureTestingModule({ imports: [ExterneFachstelleListItemContainerComponent] })
+    await TestBed.configureTestingModule({
+      imports: [ExterneFachstelleListItemContainerComponent, MockComponent(ExterneFachstelleListItemComponent)],
+    })
       .overrideComponent(ExterneFachstelleListItemContainerComponent, {
         set: {
           providers: [{ provide: ExterneFachstelleResourceService, useValue: externeFachstelleResourceService }],
diff --git a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.html b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.html
index 354c579307a5e87e7e62967fefd497bf95c3cf24..4f9f87ff25f0401b58b0ba4fb3242d8189b81d26 100644
--- a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.html
+++ b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.html
@@ -28,10 +28,10 @@
     <div class="border border-grayborder bg-background-100 p-4 shadow shadow-grayborder">
       <div class="flex flex-1 gap-6">
         <div class="flex flex-1 gap-3">
-          <ods-external-unit-icon />
+          <ods-icon name="external-unit" size="unset" />
           <div class="flex flex-1 flex-col text-base">
             <p class="text-primary">Externe Fachstelle</p>
-            <p class="text-text font-bold">{{ resource.name }}</p>
+            <p class="font-bold text-text">{{ resource.name }}</p>
           </div>
         </div>
         <div class="flex-1">
diff --git a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.spec.ts b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.spec.ts
index 20656fa1be9402f208c36a8da5ddde5f8075da48..c25c5868e95214644cbf6a1ac81d2ceb2d747b5e 100644
--- a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.spec.ts
+++ b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.spec.ts
@@ -25,8 +25,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { createStateResource, StateResource } from '@alfa-client/tech-shared';
 import { ExterneFachstelleResource } from '@alfa-client/zustaendige-stelle-shared';
+import { IconComponent } from '@ods/system';
 import { toResource } from 'libs/tech-shared/test/resource';
 import { createExterneFachstelle } from 'libs/zustaendige-stelle-shared/test/externe-fachstelle';
+import { MockComponent } from 'ng-mocks';
 import { ExterneFachstelleListItemComponent } from './externe-fachstelle-list-item.component';
 
 describe('ExterneFachstelleListItemComponent', () => {
@@ -38,7 +40,7 @@ describe('ExterneFachstelleListItemComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [ExterneFachstelleListItemComponent],
+      imports: [ExterneFachstelleListItemComponent, MockComponent(IconComponent)],
     }).compileComponents();
 
     fixture = TestBed.createComponent(ExterneFachstelleListItemComponent);
diff --git a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.ts b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.ts
index 274c1b9090b1b6e299db74c41b9a1e08cb1dd62c..9886ffa51a26f5ff00b6a44cea49a01aa4a5e36c 100644
--- a/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.ts
+++ b/alfa-client/libs/externe-fachstelle/src/lib/externe-fachstelle-list-item-container/externe-fachstelle-list-item/externe-fachstelle-list-item.component.ts
@@ -25,12 +25,12 @@ import { StateResource } from '@alfa-client/tech-shared';
 import { SpinnerComponent } from '@alfa-client/ui';
 import { ExterneFachstelleResource } from '@alfa-client/zustaendige-stelle-shared';
 import { Component, Input } from '@angular/core';
-import { ExternalUnitIconComponent, PublicAdministrationIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
 
 @Component({
   selector: 'alfa-externe-fachstelle-list-item',
   standalone: true,
-  imports: [PublicAdministrationIconComponent, ExternalUnitIconComponent, SpinnerComponent],
+  imports: [SpinnerComponent, IconComponent],
   templateUrl: './externe-fachstelle-list-item.component.html',
 })
 export class ExterneFachstelleListItemComponent {
diff --git a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.ts b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.ts
index 05558ae4b77e69cb7b278d5862fa0662c4823a93..266ad33a8ab3b24f497efb79d12278ed7bedc988 100644
--- a/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.ts
+++ b/alfa-client/libs/organisations-einheit/src/lib/organisations-einheit-list-item-container/organisations-einheit-list-item/organisations-einheit-list-item.component.ts
@@ -25,12 +25,12 @@ import { StateResource } from '@alfa-client/tech-shared';
 import { SpinnerComponent } from '@alfa-client/ui';
 import { OrganisationsEinheitResource } from '@alfa-client/zustaendige-stelle-shared';
 import { Component, Input } from '@angular/core';
-import { ExternalUnitIconComponent, PublicAdministrationIconComponent } from '@ods/system';
+import { PublicAdministrationIconComponent } from '@ods/system';
 
 @Component({
   selector: 'alfa-organisations-einheit-list-item',
   standalone: true,
-  imports: [ExternalUnitIconComponent, PublicAdministrationIconComponent, SpinnerComponent],
+  imports: [PublicAdministrationIconComponent, SpinnerComponent],
   templateUrl: './organisations-einheit-list-item.component.html',
 })
 export class OrganisationsEinheitListItemComponent {
diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
index 0d36e972d6676af3f3f214893b8ec15af0c34d36..893f93331003b302ad2a7947d435fcdc7fa04e11 100644
--- a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
+++ b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
@@ -35,7 +35,7 @@
       size="fit"
       (clickEmitter)="openPostfachNachrichtenDialog.emit()"
     >
-      <ods-mailbox-icon icon />
+      <ods-icon icon name="mailbox" fill="text" />
     </ods-button>
   }
   @if (!showAsIconButton && text && !toolTip) {
diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts
index 3ada8d77ebe66c173653ddc4e09009717382fc7c..582edc1c9651b0c0bd5be9879d64fb8fccfc72ff 100644
--- a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts
+++ b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts
@@ -25,7 +25,7 @@ import { PostfachMailListLinkRel } from '@alfa-client/postfach-shared';
 import { EMPTY_STRING, HasLinkPipe, createStateResource } from '@alfa-client/tech-shared';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { faker } from '@faker-js/faker';
-import { ButtonComponent, IconComponent, MailboxIconComponent, TooltipDirective } from '@ods/system';
+import { ButtonComponent, IconComponent, TooltipDirective } from '@ods/system';
 import { createCommandResource } from 'libs/command-shared/test/command';
 import { createPostfachMailListResource } from 'libs/postfach-shared/test/postfach';
 import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
@@ -47,7 +47,6 @@ describe('PostfachMailButtonComponent', () => {
         HasLinkPipe,
         MockComponent(ButtonComponent),
         MockComponent(IconComponent),
-        MockComponent(MailboxIconComponent),
         MockDirective(TooltipDirective),
       ],
     }).compileComponents();
diff --git a/alfa-client/libs/postfach/src/lib/postfach.module.ts b/alfa-client/libs/postfach/src/lib/postfach.module.ts
index a8a162fe8dc3101bfe6887bd904a0da0f5cf7f63..a57c2ce81047016799a2d29da42e81c962850bd3 100644
--- a/alfa-client/libs/postfach/src/lib/postfach.module.ts
+++ b/alfa-client/libs/postfach/src/lib/postfach.module.ts
@@ -42,7 +42,7 @@ import { NgModule } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatIcon } from '@angular/material/icon';
 import { RouterModule, Routes } from '@angular/router';
-import { ButtonComponent, IconComponent, MailboxIconComponent, TooltipDirective } from '@ods/system';
+import { ButtonComponent, IconComponent, TooltipDirective } from '@ods/system';
 import { MultiFileUploadComponent } from '../../../binary-file/src/lib/multi-file-upload/multi-file-upload.component';
 import { PostfachMailButtonContainerComponent } from './postfach-mail-button-container/postfach-mail-button-container.component';
 import { PostfachMailButtonComponent } from './postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component';
@@ -96,7 +96,6 @@ const routes: Routes = [
     IconButtonWithSpinnerComponent,
     ButtonComponent,
     IconComponent,
-    MailboxIconComponent,
     TooltipDirective,
     MultiFileUploadComponent,
   ],
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.html b/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.html
index 3e2682581643b2900512e82bff0a1e4b9cdf64d8..7bba8e78bd8e3cdf52a59867f25da493c07b9835 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.html
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.html
@@ -25,7 +25,7 @@
 -->
 <ng-container *ngIf="externeFachstelleResource$ | async as externeFachstelleResource; else searchButton">
   <alfa-zustaendige-stelle-header title="Externe Fachstelle" [subTitle]="externeFachstelleResource.name" [isSubTitleBold]="true">
-    <ods-external-unit-icon icon />
+    <ods-icon icon name="external-unit" size="unset" />
     <div class="flex flex-1 flex-col text-sm text-text" info>
       <p>{{ externeFachstelleResource.anschrift }}</p>
       <p>{{ 'Email: ' + externeFachstelleResource.email }}</p>
@@ -38,7 +38,7 @@
 </ng-container>
 <ng-template #searchButton>
   <alfa-zustaendige-stelle-header title="Externe Fachstelle" subTitle="Private Organisation, Verein, Schule">
-    <ods-external-unit-icon icon />
+    <ods-icon icon name="external-unit" size="unset" />
     <alfa-zustaendige-stelle-button title="Zuständige externe Fachstelle auswählen" dataTestId="externe-fachstelle-button" />
   </alfa-zustaendige-stelle-header>
 </ng-template>
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.spec.ts b/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.spec.ts
index 92e5cfada5138071eab5ba14371ab9a485b10f59..db3d5670adf95ff37dfbca3fdd989b4ffb8e2df3 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.spec.ts
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/search-externe-fachstelle-container/search-externe-fachstelle-container.component.spec.ts
@@ -30,7 +30,7 @@ import {
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormControl } from '@angular/forms';
 import { getUrl } from '@ngxp/rest';
-import { ExternalUnitIconComponent } from '@ods/system';
+import { IconComponent } from '@ods/system';
 import { createExterneFachstelleResource } from 'libs/zustaendige-stelle-shared/test/externe-fachstelle';
 import { MockComponent } from 'ng-mocks';
 import { of } from 'rxjs';
@@ -68,7 +68,7 @@ describe('SearchExterneFachstelleContainerComponent', () => {
         MockComponent(EditZustaendigeStelleButtonComponent),
         MockComponent(ZustaendigeStelleButtonComponent),
         MockComponent(ZustaendigeStelleHeaderComponent),
-        MockComponent(ExternalUnitIconComponent),
+        MockComponent(IconComponent),
       ],
       providers: [
         {
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
index f4efa3bfb07dd19e7da8cc9d2f719ed8f20e0821..0d6d6ee90204d31ec615a8b53baaae46ecad4b43 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/zustaendige-stelle.module.ts
@@ -24,13 +24,7 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import {
-  ButtonComponent,
-  ExternalUnitIconComponent,
-  IconComponent,
-  InstantSearchComponent,
-  PublicAdministrationIconComponent,
-} from '@ods/system';
+import { ButtonComponent, IconComponent, InstantSearchComponent, PublicAdministrationIconComponent } from '@ods/system';
 import { ZustaendigeStelleSharedModule } from 'libs/zustaendige-stelle-shared/src/lib/zustaendige-stelle-shared.module';
 import { EditZustaendigeStelleButtonComponent } from './edit-zustaendige-stelle-button/edit-zustaendige-stelle-button.component';
 import { SearchExterneFachstelleContainerComponent } from './search-externe-fachstelle-container/search-externe-fachstelle-container.component';
@@ -51,7 +45,6 @@ import { ZustaendigeStelleHeaderComponent } from './zustaendige-stelle-header/zu
     FormsModule,
     ReactiveFormsModule,
     ZustaendigeStelleSharedModule,
-    ExternalUnitIconComponent,
     IconComponent,
     PublicAdministrationIconComponent,
   ],