diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.html b/src/app/components/creator/room-creator-page/room-creator-page.component.html
index d95d96ef0162a2e6fdbe123d95db2913f030bb45..315eb4087d8642f1fccf3d893af8399cf2a06af3 100644
--- a/src/app/components/creator/room-creator-page/room-creator-page.component.html
+++ b/src/app/components/creator/room-creator-page/room-creator-page.component.html
@@ -3,8 +3,6 @@
     <mat-progress-spinner *ngIf="isLoading" color="accent" mode="indeterminate"></mat-progress-spinner>
     <mat-card *ngIf="room">
       <mat-card-header fxLayoutAlign="center" fxLayout="row">
-        <span class="fill-remaining-space"></span>
-        <div fxLayout="column" id="sessionHeader">
         <mat-card-title fxLayoutAlign="center">
           <h2>{{ room.name }}</h2>
         </mat-card-title>
@@ -13,11 +11,6 @@
             {{ room.shortId.slice(0,4) }} {{  room.shortId.slice(4,8) }}
           </h3>
         </mat-card-subtitle>
-        </div>
-        <span class="fill-remaining-space"></span>
-        <button mat-icon-button id= "sessionSettingsButton" color="primary" matTooltip="{{ 'room-page.session-settings' | translate}}">
-          <mat-icon>settings</mat-icon>
-        </button>
       </mat-card-header>
       <mat-divider></mat-divider>
       <mat-card-content fxLayoutAlign="center">
@@ -45,8 +38,8 @@
         </mat-grid-tile>
         <mat-grid-tile>
           <button mat-icon-button *ngIf="!modify" (click)="showEditDialog()" color="accent"
-                  matTooltip="{{ 'room-page.edit-room' | translate}}">
-            <mat-icon>create</mat-icon>
+                  matTooltip="{{ 'room-page.session-settings' | translate}}">
+            <mat-icon>settings</mat-icon>
           </button>
         </mat-grid-tile>
       </mat-grid-list>
diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.scss b/src/app/components/creator/room-creator-page/room-creator-page.component.scss
index a423ed2799317bec1776cf0a88017a34a9b56718..76845e2de3d591046ba5551c9fcef7a853a8aab3 100644
--- a/src/app/components/creator/room-creator-page/room-creator-page.component.scss
+++ b/src/app/components/creator/room-creator-page/room-creator-page.component.scss
@@ -79,12 +79,3 @@ mat-expansion-panel {
   background-color: var(--content-mat-card)!important;
   min-width: 200px;
 }
-
-#sessionHeader {
-  width: auto;
-}
-
-#sessionSettingsButton {
-  width: 10%;
-  float: right;
-}
diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json
index 921baea8c3af06f35b2e58b60e13a64b82d9a215..af310c4804af56ac1255f1301a6ad8768b49f7a4 100644
--- a/src/assets/i18n/creator/de.json
+++ b/src/assets/i18n/creator/de.json
@@ -10,7 +10,6 @@
     "create-content": "Frage erstellen",
     "live-feedback": "Live Feedback",
     "answer-statistics": "Statistiken",
-    "edit-room": "Session bearbeiten",
     "delete-room": "Session löschen",
     "sure": "Sind Sie sicher?",
     "reallySession": "Wollen Sie die Session ",
diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json
index a28e7d10733d47beaa738b0d1c02f2e6ebd65778..45bab43b25cad01617849b8fbd2a3385ebfa6c90 100644
--- a/src/assets/i18n/creator/en.json
+++ b/src/assets/i18n/creator/en.json
@@ -10,7 +10,6 @@
     "create-content": "Create content",
     "live-feedback": "Live feedback",
     "answer-statistics": "Statistics",
-    "edit-room": "Edit session",
     "delete-room": "Delete session",
     "sure": "Are you sure?",
     "reallySession": "Do you really want to delete session ",