diff --git a/client/src/app/core/layout/layout.component.html b/client/src/app/core/layout/layout.component.html
index 33d799c..2140dea 100644
--- a/client/src/app/core/layout/layout.component.html
+++ b/client/src/app/core/layout/layout.component.html
@@ -12,14 +12,14 @@
 
 <mat-drawer-container class="example-container" autosize>
   <mat-drawer #drawer class="main_sidenav" mode="side" opened="true" style="border-right: 1px solid #dfdfdf">
-    <button matButton routerLink="/" routerLinkActive="active-link" [routerLinkActiveOptions]="{exact: true}">Home</button>
-    <button matButton routerLink="/keys" routerLinkActive="active-link" class="mat-elevation-z1"><mat-icon>key</mat-icon>Schlüssel</button>
-    <button matButton routerLink="/cylinders" routerLinkActive="active-link"><mat-icon>lock</mat-icon>Zylinder</button>
-    <button matButton routerLink="/systems" routerLinkActive="active-link"><mat-icon>admin_panel_settings</mat-icon>Schließanlagen</button>
+    <div class="nav-button" routerLink="/" routerLinkActive="active-link" [routerLinkActiveOptions]="{exact: true}"><mat-icon>home</mat-icon>Home</div>
+    <div class="nav-button" routerLink="/keys" routerLinkActive="active-link"><mat-icon>key</mat-icon>Schlüssel</div>
+    <div class="nav-button" routerLink="/cylinders" routerLinkActive="active-link"><mat-icon>lock</mat-icon>Zylinder</div>
+    <div class="nav-button" routerLink="/systems" routerLinkActive="active-link"><mat-icon>admin_panel_settings</mat-icon>Schließanlagen</div>
     @if (isAdmin) {
-      <button matButton routerLink="/users" routerLinkActive="active-link"><mat-icon>user_attributes</mat-icon>Alle User</button>
+      <div class="nav-button" routerLink="/users" routerLinkActive="active-link"><mat-icon>user_attributes</mat-icon>Alle User</div>
     }
-    <button matButton (click)="openSidebar()">Einstellungen</button>
+    <div class="nav-button" (click)="openSidebar()"><mat-icon>settings</mat-icon>Einstellungen</div>
     
   </mat-drawer>
 
diff --git a/client/src/app/core/layout/layout.component.scss b/client/src/app/core/layout/layout.component.scss
index 252d098..ccc0bb0 100644
--- a/client/src/app/core/layout/layout.component.scss
+++ b/client/src/app/core/layout/layout.component.scss
@@ -16,6 +16,10 @@ mat-drawer-container {
   cursor: pointer;
 }
 
+mat-toolbar {
+  border-bottom: 1px solid #ccc;
+}
+
 mat-drawer, mat-toolbar {
   background-color: #fff;
   border-radius: 0;
@@ -34,4 +38,20 @@ mat-drawer {
 
 mat-toolbar {
   gap: 12px;
+}
+
+.nav-button {
+  display: flex;
+  padding: 12px 12px;
+  margin: 4px;
+  border-radius: 8px;
+  cursor: pointer;
+  align-items: center;
+  gap: 12px;
+
+  transition: background-color 0.2s ease-in-out;
+
+  &:hover {
+    background-color: rgb(246, 246, 247);
+  }
 }
\ No newline at end of file
diff --git a/client/src/styles.scss b/client/src/styles.scss
index 996c943..da646e0 100644
--- a/client/src/styles.scss
+++ b/client/src/styles.scss
@@ -224,6 +224,7 @@ div.ag-row {
   // background-color: rgba(0, 0, 0, 0.08) !important;
   font-weight: 500 !important;
   box-shadow: 0 3px 1px -2px rgba(0,0,0,.2),0 2px 2px 0 rgba(0,0,0,.14),0 1px 5px 0 rgba(0,0,0,.12);
-  border-top-right-radius: 0 !important;
-  border-bottom-right-radius: 0 !important;
+  // border-top-right-radius: 0 !important;
+  // border-bottom-right-radius: 0 !important;
+  color: #2D6B05;
 }
\ No newline at end of file