diff --git a/apps/web/src/app/shared/components/favorites-layout/favorites-layout.component.html b/apps/web/src/app/shared/components/favorites-layout/favorites-layout.component.html
index a12776367..53630e466 100644
--- a/apps/web/src/app/shared/components/favorites-layout/favorites-layout.component.html
+++ b/apps/web/src/app/shared/components/favorites-layout/favorites-layout.component.html
@@ -1,9 +1,10 @@
 <div class="sidebar">
     <div class="sidebar-header">
-        <button mat-icon-button disabled>
-            <mat-icon>list</mat-icon>
-        </button>
-        <h2>{{ 'PORTALS.ALL_CATEGORIES' | translate }}</h2>
+        <app-playlist-switcher
+            class="switcher"
+            [currentTitle]="playlistTitle()"
+            [subtitle]="playlistSubtitle()"
+        />
     </div>
     <app-category-view
         [items]="categories()"
diff --git a/apps/web/src/app/shared/components/favorites-layout/favorites-layout.component.ts b/apps/web/src/app/shared/components/favorites-layout/favorites-layout.component.ts
index ded9c4a27..7592b9c71 100644
--- a/apps/web/src/app/shared/components/favorites-layout/favorites-layout.component.ts
+++ b/apps/web/src/app/shared/components/favorites-layout/favorites-layout.component.ts
@@ -5,6 +5,7 @@ import { MatCardModule } from '@angular/material/card';
 import { MatIcon } from '@angular/material/icon';
 import { MatTooltip } from '@angular/material/tooltip';
 import { TranslatePipe } from '@ngx-translate/core';
+import { PlaylistSwitcherComponent } from 'components';
 import { CategoryViewComponent } from '../../../xtream-tauri/category-view/category-view.component';
 
 @Component({
@@ -20,14 +21,16 @@ import { CategoryViewComponent } from '../../../xtream-tauri/category-view/categ
         MatCardModule,
         MatIcon,
         MatIconButton,
-        /* MpvPlayerBarComponent, */
         MatTooltip,
+        PlaylistSwitcherComponent,
         TranslatePipe,
     ],
 })
 export class FavoritesLayoutComponent {
     readonly categories = input<any[]>([]);
     readonly favorites = input<any[]>([]);
+    readonly playlistSubtitle = input<string>('');
+    readonly playlistTitle = input<string>('Playlist');
     readonly selectedCategoryId = input<string>('movie');
     readonly titleTranslationString = input<string>('CHANNELS.FAVORITES');
 
diff --git a/apps/web/src/app/stalker/recently-viewed/recently-viewed.component.html b/apps/web/src/app/stalker/recently-viewed/recently-viewed.component.html
index 0739e8633..5a2365c84 100644
--- a/apps/web/src/app/stalker/recently-viewed/recently-viewed.component.html
+++ b/apps/web/src/app/stalker/recently-viewed/recently-viewed.component.html
@@ -31,10 +31,12 @@
     <app-favorites-layout
         [categories]="categories() ?? []"
         [favorites]="itemsToShow() ?? []"
+        [playlistSubtitle]="'Stalker Portal'"
+        [playlistTitle]="currentPlaylist()?.title || 'Portal'"
         [selectedCategoryId]="selectedCategoryId()"
+        [titleTranslationString]="'PORTALS.SIDEBAR.RECENT'"
         (categoryClicked)="setCategoryId($event.category_id)"
         (removeFavorite)="removeFromRecentlyViewed($event)"
-        [titleTranslationString]="'PORTALS.SIDEBAR.RECENT'"
         (openItem)="openItem($event)"
     />
 }
diff --git a/apps/web/src/app/stalker/recently-viewed/recently-viewed.component.ts b/apps/web/src/app/stalker/recently-viewed/recently-viewed.component.ts
index d45ef8478..8b2ce32d5 100644
--- a/apps/web/src/app/stalker/recently-viewed/recently-viewed.component.ts
+++ b/apps/web/src/app/stalker/recently-viewed/recently-viewed.component.ts
@@ -43,6 +43,8 @@ export class RecentlyViewedComponent {
 
     itemDetails: any = null;
 
+    readonly currentPlaylist = this.stalkerStore.currentPlaylist;
+
     readonly allFavorites = rxResource({
         params: () => ({
             refreshTimestamp: this.refreshTimestamp(),
diff --git a/apps/web/src/app/stalker/stalker-favorites/stalker-favorites.component.html b/apps/web/src/app/stalker/stalker-favorites/stalker-favorites.component.html
index f9a5c40df..73a4dff49 100644
--- a/apps/web/src/app/stalker/stalker-favorites/stalker-favorites.component.html
+++ b/apps/web/src/app/stalker/stalker-favorites/stalker-favorites.component.html
@@ -29,6 +29,8 @@
     <app-favorites-layout
         [categories]="categories() ?? []"
         [favorites]="favoritesToShow() ?? []"
+        [playlistSubtitle]="'Stalker Portal'"
+        [playlistTitle]="currentPlaylist()?.title || 'Portal'"
         [selectedCategoryId]="selectedCategoryId()"
         (categoryClicked)="setCategoryId($event.category_id)"
         (removeFavorite)="removeFromFavorites($event)"
diff --git a/apps/web/src/app/stalker/stalker-favorites/stalker-favorites.component.ts b/apps/web/src/app/stalker/stalker-favorites/stalker-favorites.component.ts
index 78d5fcf8f..fd6ea17c4 100644
--- a/apps/web/src/app/stalker/stalker-favorites/stalker-favorites.component.ts
+++ b/apps/web/src/app/stalker/stalker-favorites/stalker-favorites.component.ts
@@ -43,6 +43,8 @@ export class StalkerFavoritesComponent {
 
     itemDetails: any = null;
 
+    readonly currentPlaylist = this.stalkerStore.currentPlaylist;
+
     readonly allFavorites = rxResource({
         params: () => ({
             refreshTimestamp: this.refreshTimestamp(),
diff --git a/apps/web/src/app/stalker/stalker-main-container.component.html b/apps/web/src/app/stalker/stalker-main-container.component.html
index 9b8491c4c..865406fd8 100644
--- a/apps/web/src/app/stalker/stalker-main-container.component.html
+++ b/apps/web/src/app/stalker/stalker-main-container.component.html
@@ -9,10 +9,11 @@
             </button>
             <h2>{{ selectedCategoryTitle() }}</h2>
         } @else {
-            <button mat-icon-button disabled>
-                <mat-icon>list</mat-icon>
-            </button>
-            <h2>{{ 'PORTALS.ALL_CATEGORIES' | translate }}</h2>
+            <app-playlist-switcher
+                class="switcher"
+                [currentTitle]="currentPlaylist()?.title || 'Portal'"
+                [subtitle]="'Stalker Portal'"
+            />
         }
     </div>
     @if (isItvCategorySelected) {
diff --git a/apps/web/src/app/stalker/stalker-main-container.component.ts b/apps/web/src/app/stalker/stalker-main-container.component.ts
index 5396e8223..bfd934a9d 100644
--- a/apps/web/src/app/stalker/stalker-main-container.component.ts
+++ b/apps/web/src/app/stalker/stalker-main-container.component.ts
@@ -8,6 +8,7 @@ import { ActivatedRoute, Router, RouterOutlet } from '@angular/router';
 import { TranslatePipe } from '@ngx-translate/core';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 import { PlaylistsService } from 'services';
+import { PlaylistSwitcherComponent } from 'components';
 import { CategoryViewComponent } from '../xtream-tauri/category-view/category-view.component';
 import { PlaylistErrorViewComponent } from '../xtream/playlist-error-view/playlist-error-view.component';
 import { StalkerStore } from './stalker.store';
@@ -27,11 +28,11 @@ import { StalkerStore } from './stalker.store';
         MatIconButton,
         MatListModule,
         MatPaginatorModule,
-        /* MpvPlayerBarComponent, */
         NgxSkeletonLoaderModule,
         PlaylistErrorViewComponent,
-        TranslatePipe,
+        PlaylistSwitcherComponent,
         RouterOutlet,
+        TranslatePipe,
     ],
 })
 export class StalkerMainContainerComponent {
@@ -54,6 +55,7 @@ export class StalkerMainContainerComponent {
     readonly itvChannels = this.stalkerStore.itvChannels;
 
     readonly selectedCategoryTitle = this.stalkerStore.getSelectedCategoryName;
+    readonly currentPlaylist = this.stalkerStore.currentPlaylist;
 
     /** categories */
     readonly categories = this.stalkerStore.getCategoryResource;
diff --git a/apps/web/src/app/xtream-tauri/favorites/favorites.component.html b/apps/web/src/app/xtream-tauri/favorites/favorites.component.html
index 2a130d92b..384cedcfa 100644
--- a/apps/web/src/app/xtream-tauri/favorites/favorites.component.html
+++ b/apps/web/src/app/xtream-tauri/favorites/favorites.component.html
@@ -1,6 +1,8 @@
 <app-favorites-layout
     [categories]="categories()"
     [favorites]="favoritesToShow()"
+    [playlistSubtitle]="'Xtream Code'"
+    [playlistTitle]="currentPlaylist()?.name || currentPlaylist()?.title || 'Playlist'"
     [selectedCategoryId]="selectedCategoryId()"
     (categoryClicked)="setCategoryId($event.category_id)"
     (removeFavorite)="removeFromFavorites($event)"
diff --git a/apps/web/src/app/xtream-tauri/favorites/favorites.component.ts b/apps/web/src/app/xtream-tauri/favorites/favorites.component.ts
index 2d0be5634..b714f465a 100644
--- a/apps/web/src/app/xtream-tauri/favorites/favorites.component.ts
+++ b/apps/web/src/app/xtream-tauri/favorites/favorites.component.ts
@@ -24,6 +24,7 @@ export class FavoritesComponent implements OnInit {
     private xtreamStore = inject(XtreamStore);
 
     readonly categories = signal<XtreamCategory[]>([]);
+    readonly currentPlaylist = this.xtreamStore.currentPlaylist;
 
     readonly series = signal<FavoriteItem[]>([]);
     readonly movies = signal<FavoriteItem[]>([]);
diff --git a/apps/web/src/app/xtream-tauri/live-stream-layout/live-stream-layout.component.html b/apps/web/src/app/xtream-tauri/live-stream-layout/live-stream-layout.component.html
index cb34a6c50..58873ecc3 100644
--- a/apps/web/src/app/xtream-tauri/live-stream-layout/live-stream-layout.component.html
+++ b/apps/web/src/app/xtream-tauri/live-stream-layout/live-stream-layout.component.html
@@ -9,10 +9,11 @@
             </button>
             <h2>{{ 'HOME.PLAYLISTS.CHANNELS' | translate }}</h2>
         } @else {
-            <button mat-icon-button disabled>
-                <mat-icon>list</mat-icon>
-            </button>
-            <h2>{{ 'PORTALS.ALL_CATEGORIES' | translate }}</h2>
+            <app-playlist-switcher
+                class="switcher"
+                [currentTitle]="currentPlaylist()?.name || currentPlaylist()?.title || 'Playlist'"
+                [subtitle]="'Xtream Code'"
+            />
             <button
                 mat-icon-button
                 class="manage-categories-btn"
diff --git a/apps/web/src/app/xtream-tauri/live-stream-layout/live-stream-layout.component.ts b/apps/web/src/app/xtream-tauri/live-stream-layout/live-stream-layout.component.ts
index 11e5178b5..dbbdbd99f 100644
--- a/apps/web/src/app/xtream-tauri/live-stream-layout/live-stream-layout.component.ts
+++ b/apps/web/src/app/xtream-tauri/live-stream-layout/live-stream-layout.component.ts
@@ -14,6 +14,7 @@ import { MatListModule } from '@angular/material/list';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { ActivatedRoute } from '@angular/router';
 import { TranslatePipe } from '@ngx-translate/core';
+import { PlaylistSwitcherComponent } from 'components';
 import { XtreamCategory } from 'shared-interfaces';
 import { EpgViewComponent, WebPlayerViewComponent } from 'shared-portals';
 import { SettingsStore } from '../../services/settings-store.service';
@@ -41,6 +42,7 @@ import { XtreamStore } from '../xtream.store';
         MatListModule,
         MatTooltipModule,
         /* MpvPlayerBarComponent, */
+        PlaylistSwitcherComponent,
         PortalChannelsListComponent,
         TranslatePipe,
         WebPlayerViewComponent,
@@ -56,6 +58,7 @@ export class LiveStreamLayoutComponent implements OnInit {
 
     readonly categories = this.xtreamStore.getCategoriesBySelectedType;
     readonly categoryItemCounts = this.xtreamStore.getCategoryItemCounts;
+    readonly currentPlaylist = this.xtreamStore.currentPlaylist;
     readonly epgItems = this.xtreamStore.epgItems;
     readonly selectedCategoryId = this.xtreamStore.selectedCategoryId;
 
diff --git a/apps/web/src/app/xtream-tauri/sidebar.scss b/apps/web/src/app/xtream-tauri/sidebar.scss
index f9f32cb33..d1aab229c 100644
--- a/apps/web/src/app/xtream-tauri/sidebar.scss
+++ b/apps/web/src/app/xtream-tauri/sidebar.scss
@@ -23,6 +23,11 @@
             app-region: no-drag;
         }
 
+        .switcher {
+            flex: 1;
+            min-width: 0;
+        }
+
         .manage-categories-btn {
             margin-left: auto;
         }
diff --git a/apps/web/src/app/xtream-tauri/xtream-main-container.component.html b/apps/web/src/app/xtream-tauri/xtream-main-container.component.html
index 6c6895e60..5bf44186a 100644
--- a/apps/web/src/app/xtream-tauri/xtream-main-container.component.html
+++ b/apps/web/src/app/xtream-tauri/xtream-main-container.component.html
@@ -1,9 +1,10 @@
 <div class="sidebar">
     <div class="sidebar-header">
-        <button mat-icon-button disabled>
-            <mat-icon>list</mat-icon>
-        </button>
-        <h2>{{ 'PORTALS.ALL_CATEGORIES' | translate }}</h2>
+        <app-playlist-switcher
+            class="switcher"
+            [currentTitle]="currentPlaylist()?.name || currentPlaylist()?.title || 'Playlist'"
+            [subtitle]="'Xtream Code'"
+        />
         <button
             mat-icon-button
             class="manage-categories-btn"
diff --git a/apps/web/src/app/xtream-tauri/xtream-main-container.component.ts b/apps/web/src/app/xtream-tauri/xtream-main-container.component.ts
index 67e78bd73..a3f4e78c1 100644
--- a/apps/web/src/app/xtream-tauri/xtream-main-container.component.ts
+++ b/apps/web/src/app/xtream-tauri/xtream-main-container.component.ts
@@ -5,6 +5,7 @@ import { MatIcon } from '@angular/material/icon';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { ActivatedRoute, Router, RouterOutlet } from '@angular/router';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { PlaylistSwitcherComponent } from 'components';
 import { XtreamCategory } from 'shared-interfaces';
 import {
     CategoryManagementDialogComponent,
@@ -19,12 +20,12 @@ import { XtreamStore } from './xtream.store';
     styleUrls: ['./xtream-main-container.component.scss', './sidebar.scss'],
     imports: [
         CategoryViewComponent,
-        TranslateModule,
-        RouterOutlet,
-        /* MpvPlayerBarComponent, */
         MatIcon,
         MatIconButton,
         MatTooltipModule,
+        PlaylistSwitcherComponent,
+        RouterOutlet,
+        TranslateModule,
     ],
 })
 export class XtreamMainContainerComponent implements OnInit {
@@ -36,7 +37,7 @@ export class XtreamMainContainerComponent implements OnInit {
 
     readonly categories = this.xtreamStore.getCategoriesBySelectedType;
     readonly categoryItemCounts = this.xtreamStore.getCategoryItemCounts;
-
+    readonly currentPlaylist = this.xtreamStore.currentPlaylist;
     readonly selectedCategoryId = this.xtreamStore.selectedCategoryId;
 
     ngOnInit(): void {
diff --git a/libs/ui/components/src/lib/video-player/sidebar/sidebar.component.html b/libs/ui/components/src/lib/video-player/sidebar/sidebar.component.html
index ee13d5ec0..e5126a32e 100644
--- a/libs/ui/components/src/lib/video-player/sidebar/sidebar.component.html
+++ b/libs/ui/components/src/lib/video-player/sidebar/sidebar.component.html
@@ -1,50 +1,18 @@
 <div class="current-playlist">
-    <div class="left">
-        <button
-            mat-icon-button
-            [matTooltip]="'SETTINGS.BACK_TO_HOME' | translate"
-            (click)="goBack()"
-        >
-            <mat-icon>arrow_back_ios</mat-icon>
-        </button>
-        <div class="playlist-info">
-            <div class="name">
-                @if (sidebarView === 'CHANNELS') {
-                    {{ playlistTitle$ | async }}
-                } @else {
-                    {{ 'HOME.PLAYLISTS.MY_PLAYLISTS' | translate }}
-                }
-            </div>
-            <div class="channels-count">
-                {{
-                    sidebarView === 'CHANNELS'
-                        ? channels()?.length +
-                          ' ' +
-                          ('HOME.PLAYLISTS.CHANNELS' | translate)
-                        : ('HOME.PLAYLISTS.MY_PLAYLISTS_SUBTITLE' | translate)
-                }}
-            </div>
-        </div>
-    </div>
+    <button
+        mat-icon-button
+        routerLink="/"
+        [matTooltip]="'SETTINGS.BACK_TO_HOME' | translate"
+        class="home-btn"
+    >
+        <mat-icon>home</mat-icon>
+    </button>
 
-    @if (sidebarView === 'CHANNELS') {
-        <button
-            mat-icon-button
-            routerLink="/"
-            [matTooltip]="
-                'CHANNELS.UPLOAD_OR_SELECT_OTHER_PLAYLIST' | translate
-            "
-        >
-            <mat-icon>playlist_add</mat-icon>
-        </button>
-    }
-</div>
-@if (sidebarView === 'CHANNELS') {
-    <app-channel-list-container [channelList]="channels()" />
-} @else {
-    <app-recent-playlists
-        class="recent-playlists"
-        [sidebarMode]="true"
-        (playlistClicked)="selectPlaylist()"
+    <app-playlist-switcher
+        class="switcher"
+        [currentTitle]="playlistTitle()"
+        [subtitle]="subtitle()"
     />
-}
+</div>
+
+<app-channel-list-container [channelList]="channels()" />
diff --git a/libs/ui/components/src/lib/video-player/sidebar/sidebar.component.scss b/libs/ui/components/src/lib/video-player/sidebar/sidebar.component.scss
index 106079930..976c66665 100644
--- a/libs/ui/components/src/lib/video-player/sidebar/sidebar.component.scss
+++ b/libs/ui/components/src/lib/video-player/sidebar/sidebar.component.scss
@@ -2,45 +2,21 @@
     display: flex;
     align-items: center;
     padding: 8px;
-    justify-content: space-between;
+    gap: 4px;
     app-region: drag;
 
-    .left {
-        display: flex;
-        gap: 5px;
-    }
-
     button {
         app-region: no-drag;
     }
-}
 
-.playlist-info {
-    flex: 1;
-    max-width: 300px;
-
-    .name {
-        font-size: 1.1em;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
+    .switcher {
+        flex: 1;
+        min-width: 0;
     }
-
-    .channels-count {
-        font-size: 0.8em;
-    }
-}
-
-.recent-playlists {
-    height: calc(100vh - 60px);
-    overflow: auto;
-    width: 100%;
 }
 
 @media only screen and (max-width: 480px) {
-    .playlist-info {
-        .name {
-            max-width: 105px;
-        }
+    .current-playlist {
+        padding: 6px;
     }
 }
diff --git a/libs/ui/components/src/lib/video-player/sidebar/sidebar.component.ts b/libs/ui/components/src/lib/video-player/sidebar/sidebar.component.ts
index 6fca98c18..973e08aba 100644
--- a/libs/ui/components/src/lib/video-player/sidebar/sidebar.component.ts
+++ b/libs/ui/components/src/lib/video-player/sidebar/sidebar.component.ts
@@ -1,15 +1,13 @@
-import { AsyncPipe } from '@angular/common';
-import { Component, inject, input } from '@angular/core';
+import { Component, computed, inject, input } from '@angular/core';
 import { MatIconButton } from '@angular/material/button';
 import { MatIcon } from '@angular/material/icon';
 import { MatTooltip } from '@angular/material/tooltip';
-import { Router, RouterLink } from '@angular/router';
+import { RouterLink } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { TranslatePipe } from '@ngx-translate/core';
-import { ChannelActions } from 'm3u-state';
+import { TranslatePipe, TranslateService } from '@ngx-translate/core';
 import { selectPlaylistTitle } from 'm3u-state';
-import { Channel, SidebarView } from 'shared-interfaces';
-import { RecentPlaylistsComponent } from '../../recent-playlists/recent-playlists.component';
+import { Channel } from 'shared-interfaces';
+import { PlaylistSwitcherComponent } from '../../playlist-switcher/playlist-switcher.component';
 import { ChannelListContainerComponent } from './../../channel-list-container/channel-list-container.component';
 
 @Component({
@@ -17,12 +15,11 @@ import { ChannelListContainerComponent } from './../../channel-list-container/ch
     templateUrl: './sidebar.component.html',
     styleUrls: ['./sidebar.component.scss'],
     imports: [
-        AsyncPipe,
         ChannelListContainerComponent,
         MatIcon,
         MatIconButton,
         MatTooltip,
-        RecentPlaylistsComponent,
+        PlaylistSwitcherComponent,
         RouterLink,
         TranslatePipe,
     ],
@@ -30,22 +27,13 @@ import { ChannelListContainerComponent } from './../../channel-list-container/ch
 export class SidebarComponent {
     readonly channels = input<Channel[]>([]);
 
-    private readonly router = inject(Router);
     private readonly store = inject(Store);
+    private readonly translate = inject(TranslateService);
 
-    readonly playlistTitle$ = this.store.select(selectPlaylistTitle);
-    sidebarView: SidebarView = 'CHANNELS';
+    readonly playlistTitle = this.store.selectSignal(selectPlaylistTitle);
 
-    goBack() {
-        if (this.sidebarView === 'PLAYLISTS') {
-            this.store.dispatch(ChannelActions.resetActiveChannel());
-            this.router.navigate(['/']);
-        } else {
-            this.sidebarView = 'PLAYLISTS';
-        }
-    }
-
-    selectPlaylist() {
-        this.sidebarView = 'CHANNELS';
-    }
+    readonly subtitle = computed(() => {
+        const count = this.channels()?.length ?? 0;
+        return `${count} ${this.translate.instant('HOME.PLAYLISTS.CHANNELS')}`;
+    });
 }