diff --git a/client/components/app/SideRail.vue b/client/components/app/SideRail.vue
index 029d5095..dd10623a 100644
--- a/client/components/app/SideRail.vue
+++ b/client/components/app/SideRail.vue
@@ -72,7 +72,7 @@
     </nuxt-link>
 
     <nuxt-link v-if="showPlaylists" :to="`/library/${currentLibraryId}/bookshelf/playlists`" class="w-full h-20 flex flex-col items-center justify-center text-white text-opacity-80 border-b border-primary border-opacity-70 hover:bg-primary cursor-pointer relative" :class="isPlaylistsPage ? 'bg-primary bg-opacity-80' : 'bg-bg bg-opacity-60'">
-      <span class="material-icons text-2.5xl">playlist_play</span>
+      <span class="material-icons text-2.5xl">queue_music</span>
 
       <p class="font-book pt-0.5 text-center leading-4" style="font-size: 0.9rem">{{ $strings.ButtonPlaylists }}</p>
 
diff --git a/client/components/player/PlayerUi.vue b/client/components/player/PlayerUi.vue
index 2e4d2553..b2edb81c 100644
--- a/client/components/player/PlayerUi.vue
+++ b/client/components/player/PlayerUi.vue
@@ -32,7 +32,7 @@
 
         <ui-tooltip v-if="playerQueueItems.length" direction="top" :text="$strings.LabelViewQueue">
           <button class="outline-none text-gray-300 mx-1 lg:mx-2 hover:text-white" @mousedown.prevent @mouseup.prevent @click.stop="$emit('showPlayerQueueItems')">
-            <span class="material-icons text-2.5xl sm:text-3xl">queue_music</span>
+            <span class="material-icons text-2.5xl sm:text-3xl">playlist_play</span>
           </button>
         </ui-tooltip>
 
diff --git a/client/components/tables/podcast/EpisodeTableRow.vue b/client/components/tables/podcast/EpisodeTableRow.vue
index 188a39e3..a184b3c8 100644
--- a/client/components/tables/podcast/EpisodeTableRow.vue
+++ b/client/components/tables/podcast/EpisodeTableRow.vue
@@ -20,12 +20,12 @@
             <p class="pl-2 pr-1 text-sm font-semibold">{{ timeRemaining }}</p>
           </button>
 
-          <button v-if="libraryItemIdStreaming && !isStreamingFromDifferentLibrary" class="h-8 w-8 flex justify-center items-center mx-2" :class="isQueued ? 'text-success' : ''" @click.stop="queueBtnClick">
+          <!-- <button v-if="libraryItemIdStreaming && !isStreamingFromDifferentLibrary" class="h-8 w-8 flex justify-center items-center mx-2" :class="isQueued ? 'text-success' : ''" @click.stop="queueBtnClick">
             <span class="material-icons-outlined">{{ isQueued ? 'playlist_add_check' : 'queue' }}</span>
-          </button>
+          </button> -->
 
-          <ui-tooltip v-if="libraryItemIdStreaming && !isStreamingFromDifferentLibrary" :text="isQueued ? $strings.MessageRemoveFromPlayerQueue : $strings.MessageAddToPlayerQueue" direction="top">
-            <ui-icon-btn :icon="isQueued ? 'playlist_add_check' : 'queue'" borderless @click="queueBtnClick" />
+          <ui-tooltip v-if="libraryItemIdStreaming && !isStreamingFromDifferentLibrary" :text="isQueued ? $strings.MessageRemoveFromPlayerQueue : $strings.MessageAddToPlayerQueue" :class="isQueued ? 'text-success' : ''" direction="top">
+            <ui-icon-btn :icon="isQueued ? 'playlist_add_check' : 'playlist_play'" borderless @click="queueBtnClick" />
           </ui-tooltip>
 
           <ui-tooltip :text="userIsFinished ? $strings.MessageMarkAsNotFinished : $strings.MessageMarkAsFinished" direction="top">
diff --git a/client/pages/item/_id/index.vue b/client/pages/item/_id/index.vue
index 12cba278..7ff3ce64 100644
--- a/client/pages/item/_id/index.vue
+++ b/client/pages/item/_id/index.vue
@@ -158,7 +158,7 @@
               <ui-icon-btn icon="collections_bookmark" class="mx-0.5" outlined @click="collectionsClick" />
             </ui-tooltip>
 
-            <ui-tooltip v-if="!isPodcast" :text="$strings.LabelPlaylists" direction="top">
+            <ui-tooltip v-if="!isPodcast" :text="$strings.LabelYourPlaylists" direction="top">
               <ui-icon-btn icon="playlist_add" class="mx-0.5" outlined @click="playlistsClick" />
             </ui-tooltip>
 
diff --git a/client/pages/playlist/_id.vue b/client/pages/playlist/_id.vue
index 6ec86849..5b656849 100644
--- a/client/pages/playlist/_id.vue
+++ b/client/pages/playlist/_id.vue
@@ -52,6 +52,11 @@ export default {
       return redirect('/')
     }
 
+    // If playlist is a different library then set library as current
+    if (playlist.libraryId !== store.state.libraries.currentLibraryId) {
+      await store.dispatch('libraries/fetch', playlist.libraryId)
+    }
+
     store.commit('libraries/addUpdateUserPlaylist', playlist)
     return {
       playlistId: playlist.id