diff --git a/front/src/components/audio/PlayButton.vue b/front/src/components/audio/PlayButton.vue
index c98fdeb72..0617d971f 100644
--- a/front/src/components/audio/PlayButton.vue
+++ b/front/src/components/audio/PlayButton.vue
@@ -141,55 +141,54 @@ const isOpen = ref(false)
       <PopoverItem
         :disabled="!playable"
         :title="labels.addToQueue"
+        icon="bi-plus"
         @click.stop.prevent="enqueue"
       >
-        <i class="bi bi-plus" />{{ labels.addToQueue }}
+        {{ labels.addToQueue }}
       </PopoverItem>
 
       <PopoverItem
-        class="item basic"
         :disabled="!playable"
         :title="labels.playNext"
+        icon="bi-skip-forward-fill"
         @click.stop.prevent="enqueueNext()"
       >
-        <i class="bi bi-skip-forward-fill" />{{ labels.playNext }}
+        {{ labels.playNext }}
       </PopoverItem>
 
       <PopoverItem
-        class="item basic"
         :disabled="!playable"
         :title="labels.playNow"
+        icon="bi-play-fill"
         @click.stop.prevent="enqueueNext(true)"
       >
-        <i class="bi bi-play-fill" />{{ labels.playNow }}
+        {{ labels.playNow }}
       </PopoverItem>
 
       <PopoverItem
         v-if="track"
-        class="item basic"
         :disabled="!playable"
         :title="labels.startRadio"
+        icon="bi-broadcast"
         @click.stop.prevent="store.dispatch('radios/start', {type: 'similar', objectId: track?.id})"
       >
-        <i class="bi bi-broadcast" />{{ labels.startRadio }}
+        {{ labels.startRadio }}
       </PopoverItem>
 
       <PopoverItem
         v-if="track"
-        class="item basic"
         :disabled="!playable"
+        icon="bi-list"
         @click.stop="store.commit('playlists/chooseTrack', track)"
       >
-        <i class="bi bi-list" />
         {{ labels.addToPlaylist }}
       </PopoverItem>
 
       <PopoverItem
         v-if="track && route.name !== 'library.tracks.detail'"
-        class="item basic"
+        icon="bi-info-circle"
         @click.stop.prevent="router.push(`/library/tracks/${track?.id}/`)"
       >
-        <i class="bi bi-info-circle" />
         <span v-if="track.artist_credit?.some(ac => ac.artist.content_category === 'podcast')">
           {{ t('components.audio.PlayButton.button.episodeDetails') }}
         </span>
@@ -202,22 +201,21 @@ const isOpen = ref(false)
 
       <PopoverItem
         v-if="filterableArtist"
-        class="item basic"
         :disabled="!filterableArtist"
         :title="labels.hideArtist"
+        icon="bi-eye-slash"
         @click.stop.prevent="filterArtist"
       >
-        <i class="bi bi-eye-slash" />
         {{ labels.hideArtist }}
       </PopoverItem>
 
       <PopoverItem
         v-for="obj in getReportableObjects({track, album, artist, playlist, account, channel})"
         :key="obj.target.type + obj.target.id"
-        class="item basic"
+        icon="bi-share"
         @click.stop.prevent="report(obj)"
       >
-        <i class="bi bi-share" /> {{ obj.label }}
+        {{ obj.label }}
       </PopoverItem>
     </template>
   </Popover>