diff --git a/web-src/src/pages/PageAbout.vue b/web-src/src/pages/PageAbout.vue
index 78438737..656564b4 100644
--- a/web-src/src/pages/PageAbout.vue
+++ b/web-src/src/pages/PageAbout.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="{ title: $t('page.about.library') }" />
       </template>
-      <template #heading-right>
+      <template #actions>
         <control-button
           :button="{
             handler: openUpdateDialog,
diff --git a/web-src/src/pages/PageAlbums.vue b/web-src/src/pages/PageAlbums.vue
index 798ed31c..16f65e2a 100644
--- a/web-src/src/pages/PageAlbums.vue
+++ b/web-src/src/pages/PageAlbums.vue
@@ -34,7 +34,7 @@
           </template>
         </list-options>
       </template>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
       <template #content>
diff --git a/web-src/src/pages/PageArtist.vue b/web-src/src/pages/PageArtist.vue
index 152fa40c..fa3f92a7 100644
--- a/web-src/src/pages/PageArtist.vue
+++ b/web-src/src/pages/PageArtist.vue
@@ -24,10 +24,10 @@
           </template>
         </list-options>
       </template>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
-      <template #heading-right>
+      <template #actions>
         <control-button
           :button="{ handler: openDetails, icon: 'dots-horizontal' }"
         />
diff --git a/web-src/src/pages/PageArtistSpotify.vue b/web-src/src/pages/PageArtistSpotify.vue
index 1072d117..4831c2af 100644
--- a/web-src/src/pages/PageArtistSpotify.vue
+++ b/web-src/src/pages/PageArtistSpotify.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
-      <template #heading-right>
+      <template #actions>
         <control-button
           :button="{ handler: openDetails, icon: 'dots-horizontal' }"
         />
diff --git a/web-src/src/pages/PageArtistTracks.vue b/web-src/src/pages/PageArtistTracks.vue
index c4c45379..9262e8e6 100644
--- a/web-src/src/pages/PageArtistTracks.vue
+++ b/web-src/src/pages/PageArtistTracks.vue
@@ -25,10 +25,10 @@
           </template>
         </list-options>
       </template>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
-      <template #heading-right>
+      <template #actions>
         <control-button
           :button="{ handler: openDetails, icon: 'dots-horizontal' }"
         />
diff --git a/web-src/src/pages/PageArtists.vue b/web-src/src/pages/PageArtists.vue
index 09cb98b4..369d3090 100644
--- a/web-src/src/pages/PageArtists.vue
+++ b/web-src/src/pages/PageArtists.vue
@@ -34,7 +34,7 @@
           </template>
         </list-options>
       </template>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
       <template #content>
diff --git a/web-src/src/pages/PageAudiobooksAlbums.vue b/web-src/src/pages/PageAudiobooksAlbums.vue
index c565b6d8..18926ad0 100644
--- a/web-src/src/pages/PageAudiobooksAlbums.vue
+++ b/web-src/src/pages/PageAudiobooksAlbums.vue
@@ -5,7 +5,7 @@
       <template #options>
         <index-button-list :indices="albums.indices" />
       </template>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
       <template #content>
diff --git a/web-src/src/pages/PageAudiobooksArtist.vue b/web-src/src/pages/PageAudiobooksArtist.vue
index 605ec7f7..01e21e95 100644
--- a/web-src/src/pages/PageAudiobooksArtist.vue
+++ b/web-src/src/pages/PageAudiobooksArtist.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
-      <template #heading-right>
+      <template #actions>
         <control-button
           :button="{ handler: openDetails, icon: 'dots-horizontal' }"
         />
diff --git a/web-src/src/pages/PageAudiobooksArtists.vue b/web-src/src/pages/PageAudiobooksArtists.vue
index 8710662e..7d114934 100644
--- a/web-src/src/pages/PageAudiobooksArtists.vue
+++ b/web-src/src/pages/PageAudiobooksArtists.vue
@@ -5,7 +5,7 @@
       <template #options>
         <index-button-list :indices="artists.indices" />
       </template>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
       <template #content>
diff --git a/web-src/src/pages/PageAudiobooksGenres.vue b/web-src/src/pages/PageAudiobooksGenres.vue
index 98fd859c..4515f504 100644
--- a/web-src/src/pages/PageAudiobooksGenres.vue
+++ b/web-src/src/pages/PageAudiobooksGenres.vue
@@ -5,7 +5,7 @@
       <template #options>
         <index-button-list :indices="genres.indices" />
       </template>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
       <template #content>
diff --git a/web-src/src/pages/PageComposerAlbums.vue b/web-src/src/pages/PageComposerAlbums.vue
index 2553ae40..4fe1f5d9 100644
--- a/web-src/src/pages/PageComposerAlbums.vue
+++ b/web-src/src/pages/PageComposerAlbums.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
-      <template #heading-right>
+      <template #actions>
         <control-button
           :button="{ handler: openDetails, icon: 'dots-horizontal' }"
         />
diff --git a/web-src/src/pages/PageComposerTracks.vue b/web-src/src/pages/PageComposerTracks.vue
index 166b43aa..d21e4724 100644
--- a/web-src/src/pages/PageComposerTracks.vue
+++ b/web-src/src/pages/PageComposerTracks.vue
@@ -12,10 +12,10 @@
           </template>
         </list-options>
       </template>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
-      <template #heading-right>
+      <template #actions>
         <control-button
           :button="{ handler: openDetails, icon: 'dots-horizontal' }"
         />
diff --git a/web-src/src/pages/PageComposers.vue b/web-src/src/pages/PageComposers.vue
index 382e5f02..707947ea 100644
--- a/web-src/src/pages/PageComposers.vue
+++ b/web-src/src/pages/PageComposers.vue
@@ -5,7 +5,7 @@
       <template #options>
         <index-button-list :indices="composers.indices" />
       </template>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
       <template #content>
diff --git a/web-src/src/pages/PageFiles.vue b/web-src/src/pages/PageFiles.vue
index f9a8f3f9..8a2dc888 100644
--- a/web-src/src/pages/PageFiles.vue
+++ b/web-src/src/pages/PageFiles.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="{ title: name }" />
       </template>
-      <template #heading-right>
+      <template #actions>
         <control-button
           :button="{ handler: openDetails, icon: 'dots-horizontal' }"
         />
diff --git a/web-src/src/pages/PageGenreAlbums.vue b/web-src/src/pages/PageGenreAlbums.vue
index a0f3455d..f2c1fd59 100644
--- a/web-src/src/pages/PageGenreAlbums.vue
+++ b/web-src/src/pages/PageGenreAlbums.vue
@@ -4,10 +4,10 @@
       <template #options>
         <index-button-list :indices="albums.indices" />
       </template>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
-      <template #heading-right>
+      <template #actions>
         <control-button
           :button="{ handler: openDetails, icon: 'dots-horizontal' }"
         />
diff --git a/web-src/src/pages/PageGenreTracks.vue b/web-src/src/pages/PageGenreTracks.vue
index d1ac54aa..37ed2484 100644
--- a/web-src/src/pages/PageGenreTracks.vue
+++ b/web-src/src/pages/PageGenreTracks.vue
@@ -12,10 +12,10 @@
           </template>
         </list-options>
       </template>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
-      <template #heading-right>
+      <template #actions>
         <control-button
           :button="{ handler: openDetails, icon: 'dots-horizontal' }"
         />
diff --git a/web-src/src/pages/PageGenres.vue b/web-src/src/pages/PageGenres.vue
index cccec119..da5c2261 100644
--- a/web-src/src/pages/PageGenres.vue
+++ b/web-src/src/pages/PageGenres.vue
@@ -5,7 +5,7 @@
       <template #options>
         <index-button-list :indices="genres.indices" />
       </template>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
       <template #content>
diff --git a/web-src/src/pages/PageMusic.vue b/web-src/src/pages/PageMusic.vue
index 9ea4e3a2..13172bbb 100644
--- a/web-src/src/pages/PageMusic.vue
+++ b/web-src/src/pages/PageMusic.vue
@@ -2,7 +2,7 @@
   <div>
     <tabs-music />
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title
           :content="{ title: $t('page.music.recently-added.title') }"
         />
@@ -20,7 +20,7 @@
       </template>
     </content-with-heading>
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title
           :content="{ title: $t('page.music.recently-played.title') }"
         />
diff --git a/web-src/src/pages/PageMusicRecentlyAdded.vue b/web-src/src/pages/PageMusicRecentlyAdded.vue
index 897fe387..55d3d352 100644
--- a/web-src/src/pages/PageMusicRecentlyAdded.vue
+++ b/web-src/src/pages/PageMusicRecentlyAdded.vue
@@ -2,7 +2,7 @@
   <div>
     <tabs-music />
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title
           :content="{ title: $t('page.music.recently-added.title') }"
         />
diff --git a/web-src/src/pages/PageMusicRecentlyPlayed.vue b/web-src/src/pages/PageMusicRecentlyPlayed.vue
index 032bffad..3e6372a5 100644
--- a/web-src/src/pages/PageMusicRecentlyPlayed.vue
+++ b/web-src/src/pages/PageMusicRecentlyPlayed.vue
@@ -2,7 +2,7 @@
   <div>
     <tabs-music />
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title
           :content="{ title: $t('page.music.recently-played.title') }"
         />
diff --git a/web-src/src/pages/PageMusicSpotify.vue b/web-src/src/pages/PageMusicSpotify.vue
index d095b493..511b477b 100644
--- a/web-src/src/pages/PageMusicSpotify.vue
+++ b/web-src/src/pages/PageMusicSpotify.vue
@@ -2,7 +2,7 @@
   <div>
     <tabs-music />
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title
           :content="{ title: $t('page.spotify.music.new-releases') }"
         />
@@ -20,7 +20,7 @@
       </template>
     </content-with-heading>
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title
           :content="{ title: $t('page.spotify.music.featured-playlists') }"
         />
diff --git a/web-src/src/pages/PageMusicSpotifyFeaturedPlaylists.vue b/web-src/src/pages/PageMusicSpotifyFeaturedPlaylists.vue
index 84d70c89..37ccc0cc 100644
--- a/web-src/src/pages/PageMusicSpotifyFeaturedPlaylists.vue
+++ b/web-src/src/pages/PageMusicSpotifyFeaturedPlaylists.vue
@@ -2,7 +2,7 @@
   <div>
     <tabs-music />
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
       <template #content>
diff --git a/web-src/src/pages/PageMusicSpotifyNewReleases.vue b/web-src/src/pages/PageMusicSpotifyNewReleases.vue
index 5a0025aa..4261e72d 100644
--- a/web-src/src/pages/PageMusicSpotifyNewReleases.vue
+++ b/web-src/src/pages/PageMusicSpotifyNewReleases.vue
@@ -2,7 +2,7 @@
   <div>
     <tabs-music />
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
       <template #content>
diff --git a/web-src/src/pages/PagePlaylistFolder.vue b/web-src/src/pages/PagePlaylistFolder.vue
index 1889e42b..f1f9f2ab 100644
--- a/web-src/src/pages/PagePlaylistFolder.vue
+++ b/web-src/src/pages/PagePlaylistFolder.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
       <template #content>
diff --git a/web-src/src/pages/PagePlaylistTracks.vue b/web-src/src/pages/PagePlaylistTracks.vue
index 16c9be3d..1aa7fb90 100644
--- a/web-src/src/pages/PagePlaylistTracks.vue
+++ b/web-src/src/pages/PagePlaylistTracks.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
-      <template #heading-right>
+      <template #actions>
         <control-button
           :button="{ handler: openDetails, icon: 'dots-horizontal' }"
         />
diff --git a/web-src/src/pages/PagePlaylistTracksSpotify.vue b/web-src/src/pages/PagePlaylistTracksSpotify.vue
index f486322f..23dbb7ce 100644
--- a/web-src/src/pages/PagePlaylistTracksSpotify.vue
+++ b/web-src/src/pages/PagePlaylistTracksSpotify.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
-      <template #heading-right>
+      <template #actions>
         <control-button
           :button="{ handler: openDetails, icon: 'dots-horizontal' }"
         />
diff --git a/web-src/src/pages/PagePodcasts.vue b/web-src/src/pages/PagePodcasts.vue
index 14a12b60..69d20b37 100644
--- a/web-src/src/pages/PagePodcasts.vue
+++ b/web-src/src/pages/PagePodcasts.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <content-with-heading v-if="tracks.items.length > 0">
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="{ title: $t('page.podcasts.new-episodes') }" />
       </template>
-      <template #heading-right>
+      <template #actions>
         <control-button
           :button="{
             handler: markAllAsPlayed,
@@ -22,10 +22,10 @@
       </template>
     </content-with-heading>
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
-      <template #heading-right>
+      <template #actions>
         <control-button
           v-if="rss.tracks > 0"
           :button="{
@@ -36,7 +36,7 @@
         />
         <control-button
           :button="{
-            handler: 'openAddPodcastDialog',
+            handler: openAddPodcastDialog,
             icon: 'rss',
             key: 'actions.add'
           }"
diff --git a/web-src/src/pages/PageQueue.vue b/web-src/src/pages/PageQueue.vue
index 450facd0..a6540a3e 100644
--- a/web-src/src/pages/PageQueue.vue
+++ b/web-src/src/pages/PageQueue.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
-      <template #heading-right>
+      <template #actions>
         <control-button
           :button="{
             handler: uiStore.toggleHideReadItems,
diff --git a/web-src/src/pages/PageRadioStreams.vue b/web-src/src/pages/PageRadioStreams.vue
index 9b11a3a3..77d0357e 100644
--- a/web-src/src/pages/PageRadioStreams.vue
+++ b/web-src/src/pages/PageRadioStreams.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="heading" />
       </template>
       <template #content>
diff --git a/web-src/src/pages/PageSearchLibrary.vue b/web-src/src/pages/PageSearchLibrary.vue
index 4cfb3f85..f6a40cdd 100644
--- a/web-src/src/pages/PageSearchLibrary.vue
+++ b/web-src/src/pages/PageSearchLibrary.vue
@@ -50,7 +50,7 @@
   <tabs-search @search-library="search" @search-spotify="searchSpotify" />
   <template v-for="[type, items] in results" :key="type">
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title :content="{ title: $t(`page.search.${type}s`) }" />
       </template>
       <template #content>
diff --git a/web-src/src/pages/PageSearchSpotify.vue b/web-src/src/pages/PageSearchSpotify.vue
index 2d57b5dc..b1e65c4a 100644
--- a/web-src/src/pages/PageSearchSpotify.vue
+++ b/web-src/src/pages/PageSearchSpotify.vue
@@ -33,7 +33,7 @@
   <tabs-search @search-library="searchLibrary" @search-spotify="search" />
   <template v-for="[type, items] in results" :key="type">
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title
           :content="{ title: $t(`page.spotify.search.${type}s`) }"
         />
diff --git a/web-src/src/pages/PageSettingsArtwork.vue b/web-src/src/pages/PageSettingsArtwork.vue
index b2ff10dd..1243c05a 100644
--- a/web-src/src/pages/PageSettingsArtwork.vue
+++ b/web-src/src/pages/PageSettingsArtwork.vue
@@ -2,7 +2,7 @@
   <div>
     <tabs-settings />
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title
           :content="{ title: $t('page.settings.artwork.title') }"
         />
diff --git a/web-src/src/pages/PageSettingsOnlineServices.vue b/web-src/src/pages/PageSettingsOnlineServices.vue
index 99fccf43..abafcb74 100644
--- a/web-src/src/pages/PageSettingsOnlineServices.vue
+++ b/web-src/src/pages/PageSettingsOnlineServices.vue
@@ -2,15 +2,12 @@
   <div>
     <tabs-settings />
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title
           :content="{ title: $t('page.settings.services.spotify.title') }"
         />
       </template>
       <template #content>
-        <div v-if="!spotify.spotify_installed" class="notification help">
-          <p v-text="$t('page.settings.services.spotify.no-support')" />
-        </div>
         <div v-if="spotify.spotify_installed">
           <div>
             <p
@@ -54,18 +51,16 @@
             </div>
           </div>
         </div>
+        <div v-else v-text="$t('page.settings.services.spotify.no-support')" />
       </template>
     </content-with-heading>
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title
           :content="{ title: $t('page.settings.services.lastfm.title') }"
         />
       </template>
       <template #content>
-        <div v-if="!lastfm.enabled" class="notification is-size-7">
-          <p v-text="$t('page.settings.services.lastfm.no-support')" />
-        </div>
         <div v-if="lastfm.enabled">
           <p
             class="content"
@@ -118,6 +113,7 @@
             </form>
           </div>
         </div>
+        <div v-else v-text="$t('page.settings.services.lastfm.no-support')" />
       </template>
     </content-with-heading>
   </div>
diff --git a/web-src/src/pages/PageSettingsRemotesOutputs.vue b/web-src/src/pages/PageSettingsRemotesOutputs.vue
index a9266b36..dfb014a6 100644
--- a/web-src/src/pages/PageSettingsRemotesOutputs.vue
+++ b/web-src/src/pages/PageSettingsRemotesOutputs.vue
@@ -2,7 +2,7 @@
   <div>
     <tabs-settings />
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title
           :content="{ title: $t('page.settings.devices.pairing') }"
         />
@@ -40,7 +40,7 @@
       </template>
     </content-with-heading>
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title
           :content="{ title: $t('page.settings.devices.speaker-pairing') }"
         />
diff --git a/web-src/src/pages/PageSettingsWebinterface.vue b/web-src/src/pages/PageSettingsWebinterface.vue
index df8686cb..ff3d2cd5 100644
--- a/web-src/src/pages/PageSettingsWebinterface.vue
+++ b/web-src/src/pages/PageSettingsWebinterface.vue
@@ -2,7 +2,7 @@
   <div>
     <tabs-settings />
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title
           :content="{ title: $t('page.settings.general.language') }"
         />
@@ -15,7 +15,7 @@
       </template>
     </content-with-heading>
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title
           :content="{ title: $t('page.settings.general.navigation-items') }"
         />
@@ -88,7 +88,7 @@
       </template>
     </content-with-heading>
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title
           :content="{ title: $t('page.settings.general.now-playing-page') }"
         />
@@ -136,7 +136,7 @@
       </template>
     </content-with-heading>
     <content-with-heading>
-      <template #heading-left>
+      <template #heading>
         <heading-title
           :content="{ title: $t('page.settings.general.recently-added-page') }"
         />
diff --git a/web-src/src/templates/ContentWithHeading.vue b/web-src/src/templates/ContentWithHeading.vue
index 2c5e6a3f..d30151b4 100644
--- a/web-src/src/templates/ContentWithHeading.vue
+++ b/web-src/src/templates/ContentWithHeading.vue
@@ -20,16 +20,16 @@
                   class="level-item is-flex-shrink-1 has-text-centered-mobile"
                 >
                   <div>
-                    <slot name="heading-left" />
+                    <slot name="heading" />
                   </div>
                 </div>
               </div>
               <div
-                v-if="$slots['heading-right']"
+                v-if="$slots.actions"
                 class="level-right has-text-centered-mobile"
               >
                 <div class="buttons">
-                  <slot name="heading-right" />
+                  <slot name="actions" />
                 </div>
               </div>
             </nav>