diff --git a/src/app/player/components/epg-list/epg-list.component.html b/src/app/player/components/epg-list/epg-list.component.html
index 26733c158..38418e5e4 100644
--- a/src/app/player/components/epg-list/epg-list.component.html
+++ b/src/app/player/components/epg-list/epg-list.component.html
@@ -29,7 +29,7 @@
                 <mat-icon>chevron_left</mat-icon>
             </button>
             <span class="selected-date">
-                {{ dateToday | momentDate: 'YYYYMMDD':'MMMM Do, dddd' }}</span
+                {{ dateToday | momentDate: 'YYYYMMDD' : 'MMMM Do, dddd' }}</span
             >
             <button
                 class="next-day"
@@ -47,11 +47,12 @@
     <mat-selection-list
         id="program-list"
         [multiple]="false"
+        hideSingleSelectionIndicator="true"
         *ngIf="timeshiftUntil$ | async as timeshiftUntil"
     >
         <ng-container *ngIf="items?.length > 0; else epgNotAvailable">
             <ng-container *ngFor="let item of items">
-                <mat-list-item
+                <mat-list-option
                     *ngIf="
                         item.start < timeshiftUntil || item.start >= timeNow;
                         else timeshiftItem
@@ -65,7 +66,7 @@
                         ></app-epg-list-item>
                     </div>
                     <p matListItemLine>{{ item?.title[0]?.value }}</p>
-                </mat-list-item>
+                </mat-list-option>
                 <ng-template #timeshiftItem>
                     <mat-list-option
                         [value]="item"
diff --git a/src/app/player/components/epg-list/epg-list.component.scss b/src/app/player/components/epg-list/epg-list.component.scss
index 34ac0bf7f..6a89462c1 100644
--- a/src/app/player/components/epg-list/epg-list.component.scss
+++ b/src/app/player/components/epg-list/epg-list.component.scss
@@ -17,17 +17,12 @@
     flex-direction: column;
     box-sizing: border-box;
     display: flex;
-    flex: 1 1 120px;
-    max-height: 120px;
-    min-height: 120px;
 
     .channel-info {
         flex-direction: row;
         box-sizing: border-box;
         display: flex;
-        flex: 1 1 79px;
-        max-height: 79px;
-        min-height: 79px;
+        padding: 10px;
     }
 
     .channel-icon {
@@ -80,31 +75,11 @@ mat-selection-list {
 }
 
 #date-navigator {
-    flex-direction: row;
-    box-sizing: border-box;
     display: flex;
-    flex: 1 1 40px;
-    max-height: 40px;
-    min-height: 40px;
+    justify-content: space-between;
+    align-items: center;
 
     .selected-date {
         font-size: 0.9em;
-        place-content: center;
-        align-items: center;
-        flex-direction: row;
-        box-sizing: border-box;
-        display: flex;
-        flex: 1 1 100%;
-        max-width: 100%;
-    }
-
-    .previous-day {
-        flex: 1 1 40px;
-        box-sizing: border-box;
-    }
-
-    .next-day {
-        flex: 1 1 40px;
-        box-sizing: border-box;
     }
 }
diff --git a/src/app/player/components/multi-epg/multi-epg-container.component.scss b/src/app/player/components/multi-epg/multi-epg-container.component.scss
index 4a8a8fd38..cf00a3f5b 100644
--- a/src/app/player/components/multi-epg/multi-epg-container.component.scss
+++ b/src/app/player/components/multi-epg/multi-epg-container.component.scss
@@ -36,6 +36,7 @@ rect {
 .parent {
     display: flex;
     background-color: black;
+    color: #fff;
 }
 
 #channels-column {
@@ -51,9 +52,10 @@ rect {
 
 #epg-navigation {
     display: flex;
-    background-color: black;
+    background-color: white;
     margin-top: 30px;
     border-bottom: 2px solid #fff;
+    align-items: center;
 }
 
 .today-date {
@@ -68,3 +70,11 @@ rect {
     stroke-width: 2px;
     stroke: white;
 }
+
+::ng-deep {
+    .dark-theme {
+        #epg-navigation {
+            background-color: black;
+        }
+    }
+}
\ No newline at end of file