diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index 57fbdde0d46adfd10a0bba04085d770fb5139acf..cadf96b40c3c7f435fb0bdf24c00b80dc9a44893 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -52,15 +52,15 @@
         <span *ngIf="user.isGuest" svgIcon="meeting_room">{{'header.visited-sessions' | translate}}</span>
       </button>
       <button mat-menu-item *ngIf="user" (click)="openUserBonusTokenDialog()" tabindex="0">
-        <mat-icon color="warn">grade</mat-icon>
+        <mat-icon>grade</mat-icon>
         <span>{{'header.user-bonus-token' | translate}}</span>
       </button>
       <button mat-menu-item *ngIf="user && !user.isGuest" (click)="openDeleteUserDialog()" tabindex="0">
-        <mat-icon color="warn">delete</mat-icon>
+        <mat-icon class="color-warn">delete</mat-icon>
         <span>{{'header.delete-account' | translate}}</span>
       </button>
       <button mat-menu-item (click)="logout()" tabindex="0">
-        <mat-icon color="warn">exit_to_app</mat-icon>
+        <mat-icon class="color-warn">exit_to_app</mat-icon>
         <span>{{ 'header.logout' | translate }}</span>
       </button>
     </mat-menu>
diff --git a/src/app/components/shared/header/header.component.scss b/src/app/components/shared/header/header.component.scss
index 79f4c182229bc62b47e3a42ce3a9ea3e7141ee05..993892fb2e1d9678a05e7fcdc5a155422fcf9115 100644
--- a/src/app/components/shared/header/header.component.scss
+++ b/src/app/components/shared/header/header.component.scss
@@ -63,3 +63,7 @@ svg {
 .question-focus-btn-txt{
   padding-left:6px;
 }
+
+.color-warn {
+  color: red;
+}
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 c28e393f90eaedd55020444b03baf33ab8576f7a..b035d27677279c6ed873db180fe077ccfe2cfb12 100644
--- a/src/app/components/shared/room-list/room-list.component.html
+++ b/src/app/components/shared/room-list/room-list.component.html
@@ -32,7 +32,7 @@
           </th>
           <td mat-cell class="clickable" *matCellDef="let room" (click)="setCurrentRoom(room.shortId)"
               routerLink="/{{ roleToString((room.role)) }}/room/{{ room.shortId }}">
-            <span matBadge="{{room.commentCount > 0 ? room.commentCount : null}}" matBadgeOverlap="false">
+            <span matBadge="{{room.commentCount > 0 ? room.commentCount : null}}" matBadgePosition="before" matBadgeSize="small" matBadgeOverlap="false">
               &raquo;{{room.name}}&laquo;
             </span>
           </td>
diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json
index ca5bf1905576ac67040363ccb87cfb009501e9e2..6b070d2265c69cc1e51d6c3bfa2ec3274fb53e63 100644
--- a/src/assets/i18n/creator/en.json
+++ b/src/assets/i18n/creator/en.json
@@ -106,7 +106,7 @@
     "mark-read": "Discussed by you in full screen mode on the projector",
     "mark-wrong": "Mark as wrong",
     "new-comment": "A new question with the content, {{ comment }}, has been asked.",
-    "no-comments": "No questions present",
+    "no-comments": "No questions at present",
     "reject": "Remove inappropriate question from the list",
     "search-box-input-description": "Here you can search for questions.",
     "semicolon": "CSV format (.csv)",
diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json
index 23264ed6c8a36c020346a36f9f7913e471cceb34..bf4cd7df2f20b726a7e98fb39455e7beb25ea83e 100644
--- a/src/assets/i18n/participant/en.json
+++ b/src/assets/i18n/participant/en.json
@@ -96,7 +96,7 @@
     "mark-not-wrong": "Marked as wrong by the professor",
     "mark-read": "Already discussed by the professor",
     "new-comment": "A new question with the content, {{ comment }}, has been asked.",
-    "no-comments": "No questions present",
+    "no-comments": "No questions at present",
     "search-box-input-description": "Here you can search for questions.",
     "send": "Send",
     "send-description": "Send question",