diff --git a/src/app/components/shared/room-list/room-list.component.html b/src/app/components/shared/room-list/room-list.component.html
index ca95f9072427af76bf56ffa38df665f32a91697c..ba9f14fadb2f3392c9b9313755dfe28583be72e2 100644
--- a/src/app/components/shared/room-list/room-list.component.html
+++ b/src/app/components/shared/room-list/room-list.component.html
@@ -13,7 +13,7 @@
   </mat-expansion-panel>
   <mat-expansion-panel *ngFor="let room of rooms" class="matPanel">
     <mat-expansion-panel-header class="matPanelListHeader">
-      <button mat-mini-fab routerLink="/{{ baseUrl }}/room/{{ room.shortId }}" (click)="setCurrentRoom(room.shortId)">
+      <button mat-flat-button routerLink="/{{ baseUrl }}/room/{{ room.shortId }}" (click)="setCurrentRoom(room.shortId)">
         <mat-icon>input</mat-icon>
       </button>
       <mat-panel-title class="panelTitle">
diff --git a/src/app/components/shared/room-list/room-list.component.scss b/src/app/components/shared/room-list/room-list.component.scss
index 66f62efcb56028758a847c00e63126aaecc4a9bf..a1526bc771692132ce84bff680ad4f485d4c79c4 100644
--- a/src/app/components/shared/room-list/room-list.component.scss
+++ b/src/app/components/shared/room-list/room-list.component.scss
@@ -1,6 +1,7 @@
 button {
   margin-right: 10px;
-  color: var(--primary);
+  background-color: var(--secondary);
+  color: var(--on-secondary);
 }
 
 .mat-expansion-panel-header-description {
@@ -10,19 +11,19 @@ button {
 
 
 .matPanel {
-  background-color: var(--grey);
+  background-color: var(--primary-variant);
   margin-bottom: 5px;
-  color: black!important;
+  color: var(--on-surface)!important;
 }
 
 #matPanelHeader {
-  background-color: var(--grey-light);
+  background-color: var(--primary-variant);
   margin-bottom: 5px;
-  color: white;
+  color: var(--on-surface);
 }
 
 .matPanelListHeader {
-  background-color: var(--grey) !important;
+  background-color: var(--primary-variant) !important;
 }
 
 mat-panel-title {
@@ -33,12 +34,12 @@ mat-panel-title {
 
 .headerTitle {
   width: 8%;
-  color: var(--on-background)!important;
+  color: var(--on-surface)!important;
 }
 
 .panelTitle {
   width: 8%;
-  color: black!important;
+  color: var(--on-surface)!important;
 }
 
 
diff --git a/src/theme/dark-theme/darkTheme.const.ts b/src/theme/dark-theme/darkTheme.const.ts
index ed12749df331c78141b5c6808475e181f29a2848..dca8535d27dcefba290e00ce47346c06797431f0 100644
--- a/src/theme/dark-theme/darkTheme.const.ts
+++ b/src/theme/dark-theme/darkTheme.const.ts
@@ -1,7 +1,7 @@
 export const dark = {
 
   '--primary' : '#bb86fc',
-  '--primary-variant': '#3700b3',
+  '--primary-variant': '#616161',
 
   '--secondary': '#03dac6',
   '--secondary-variant': '#6f74dd',