diff --git a/alfa-client/apps/admin/src/app/app.component.html b/alfa-client/apps/admin/src/app/app.component.html
index 55e1c8824521c5c846932ee5d648172d86466705..e6cf848872ff3ce9ca2d3f62b7a64c40a325a768 100644
--- a/alfa-client/apps/admin/src/app/app.component.html
+++ b/alfa-client/apps/admin/src/app/app.component.html
@@ -34,7 +34,7 @@
       routerLink="/"
       data-test-id="logo-link"
     >
-      <ods-admin-logo-icon />
+      <ods-icon name="admin-logo" size="unset" />
     </a>
     <user-profile-button-container
       [apiRootStateResource]="apiRootStateResource$ | async"
@@ -45,7 +45,7 @@
     <ods-navbar data-test-id="navigation">
       @if (apiRoot | hasLink: apiRootLinkRel.USERS) {
         <ods-nav-item data-test-id="users-roles-navigation" caption="Benutzer & Rollen" [path]="routes.BENUTZER">
-          <ods-users-icon class="stroke-text" icon />
+          <ods-icon icon name="users" class="fill-none stroke-text" />
         </ods-nav-item>
       }
       @if (apiRoot | hasLink: apiRootLinkRel.ORGANISATIONS_EINHEIT) {
@@ -54,7 +54,7 @@
           caption="Organisationseinheiten"
           [path]="routes.ORGANISATIONSEINHEITEN"
         >
-          <ods-orga-unit-icon icon />
+          <ods-icon icon name="orga-unit" color="text" />
         </ods-nav-item>
         <hr />
       }
diff --git a/alfa-client/apps/admin/src/app/app.component.spec.ts b/alfa-client/apps/admin/src/app/app.component.spec.ts
index fb01cab1df3733fa40d66591f3562cf452661d65..8f149b9d4abb1c81897a5424cbc16a2fd1f08efd 100644
--- a/alfa-client/apps/admin/src/app/app.component.spec.ts
+++ b/alfa-client/apps/admin/src/app/app.component.spec.ts
@@ -38,7 +38,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, Router, RouterOutlet } from '@angular/router';
 import { AuthenticationService } from '@authentication';
 import {
-  AdminLogoIconComponent,
+  IconComponent,
   MailboxIconComponent,
   NavbarComponent,
   NavItemComponent,
@@ -100,7 +100,7 @@ describe('AppComponent', () => {
       imports: [HasLinkPipe],
       declarations: [
         AppComponent,
-        MockComponent(AdminLogoIconComponent),
+        MockComponent(IconComponent),
         MockComponent(OrgaUnitIconComponent),
         MockComponent(UsersIconComponent),
         MockComponent(MailboxIconComponent),
diff --git a/alfa-client/apps/admin/src/app/app.component.ts b/alfa-client/apps/admin/src/app/app.component.ts
index 989a4ad4b3fd75d2767750eb535a8db27a9d6c29..8cc01f4def2797cc9f5bdfc10231c4308e881e20 100644
--- a/alfa-client/apps/admin/src/app/app.component.ts
+++ b/alfa-client/apps/admin/src/app/app.component.ts
@@ -33,7 +33,7 @@ import { Component, inject, OnInit } from '@angular/core';
 import { Router, RouterLink, RouterOutlet } from '@angular/router';
 import { AuthenticationService } from '@authentication';
 import { hasLink } from '@ngxp/rest';
-import { AdminLogoIconComponent, NavbarComponent, NavItemComponent, OrgaUnitIconComponent, UsersIconComponent, } from '@ods/system';
+import { IconComponent, NavbarComponent, NavItemComponent } from '@ods/system';
 import { filter, Observable, Subscription } from 'rxjs';
 import { UserProfileButtonContainerComponent } from '../../../../libs/admin/user-profile/src/lib/user-menu/user-profile.button-container.component';
 import { UnavailablePageComponent } from '../pages/unavailable/unavailable-page/unavailable-page.component';
@@ -47,10 +47,8 @@ import { UnavailablePageComponent } from '../pages/unavailable/unavailable-page/
     CommonModule,
     NavbarComponent,
     NavItemComponent,
-    UsersIconComponent,
     UserProfileButtonContainerComponent,
-    AdminLogoIconComponent,
-    OrgaUnitIconComponent,
+    IconComponent,
     RouterOutlet,
     UnavailablePageComponent,
     BuildInfoComponent,
diff --git a/alfa-client/libs/design-system/src/assets/users.svg b/alfa-client/libs/design-system/src/assets/users.svg
new file mode 100644
index 0000000000000000000000000000000000000000..bd2e8130ced89bff847c01a23939518dc0a23791
--- /dev/null
+++ b/alfa-client/libs/design-system/src/assets/users.svg
@@ -0,0 +1,34 @@
+<svg
+    viewBox="0 0 24 24"
+    aria-hidden="true"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M16 21V19C16 17.9391 15.5786 16.9217 14.8284 16.1716C14.0783 15.4214 13.0609 15 12 15H6C4.93913 15 3.92172 15.4214 3.17157 16.1716C2.42143 16.9217 2 17.9391 2 19V21"
+      stroke-width="2"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      fill="none"
+    />
+    <path
+      d="M9 11C11.2091 11 13 9.20914 13 7C13 4.79086 11.2091 3 9 3C6.79086 3 5 4.79086 5 7C5 9.20914 6.79086 11 9 11Z"
+      stroke-width="2"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      fill="none"
+    />
+    <path
+      d="M22 20.9999V18.9999C21.9993 18.1136 21.7044 17.2527 21.1614 16.5522C20.6184 15.8517 19.8581 15.3515 19 15.1299"
+      stroke-width="2"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      fill="none"
+    />
+    <path
+      d="M16 3.12988C16.8604 3.35018 17.623 3.85058 18.1676 4.55219C18.7122 5.2538 19.0078 6.11671 19.0078 7.00488C19.0078 7.89305 18.7122 8.75596 18.1676 9.45757C17.623 10.1592 16.8604 10.6596 16 10.8799"
+      stroke-width="2"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      fill="none"
+    />
+  </svg>
\ No newline at end of file