diff --git a/front/src/components/library/ArtistBase.vue b/front/src/components/library/ArtistBase.vue
index 48a7c8f12..9dfb4a768 100644
--- a/front/src/components/library/ArtistBase.vue
+++ b/front/src/components/library/ArtistBase.vue
@@ -178,55 +178,54 @@ watch(() => props.id, fetchData, { immediate: true })
               <template #items>
                 <PopoverItem
                   v-if="domain != store.getters['instance/domain']"
-                  :href="object.fid"
+                  :to="object.fid"
                   target="_blank"
-                  class="funkwhale item"
+                  icon="bi bi-box-arrow-up-right"
                 >
-                  <i class="bi bi-box-arrow-up-right" />
                   {{ t('components.library.ArtistBase.link.domain', {domain: domain}) }}
                 </PopoverItem>
 
                 <PopoverItem
                   v-if="publicLibraries.length > 0"
                   @click="showEmbedModal = true"
+                  icon="bi-code-square"
                 >
-                  <i class="bi bi-code-square" />
                   {{ t('components.library.ArtistBase.button.embed') }}
                 </PopoverItem>
 
                 <PopoverItem
-                  :href="wikipediaUrl"
+                  :to="wikipediaUrl"
                   target="_blank"
                   rel="noreferrer noopener"
+                  icon="bi-wikipedia"
                 >
-                  <i class="bi bi-wikipedia" />
                   {{ t('components.library.ArtistBase.link.wikipedia') }}
                 </PopoverItem>
 
                 <PopoverItem
                   v-if="musicbrainzUrl"
-                  :href="musicbrainzUrl"
+                  :to="musicbrainzUrl"
                   target="_blank"
                   rel="noreferrer noopener"
+                  icon="bi-box-arrow-up-right"
                 >
-                  <i class="bi bi-box-arrow-up-right" />
                   {{ t('components.library.ArtistBase.link.musicbrainz') }}
                 </PopoverItem>
 
                 <PopoverItem
-                  :href="discogsUrl"
+                  :to="discogsUrl"
                   target="_blank"
                   rel="noreferrer noopener"
+                  icon="bi-box-arrow-up-right"
                 >
-                  <i class="bi bi-box-arrow-up-right" />
                   {{ t('components.library.ArtistBase.link.discogs') }}
                 </PopoverItem>
 
                 <PopoverItem
                   v-if="object.is_local"
                   :to="{name: 'library.artists.edit', params: {id: object.id }}"
+                  icon="bi-pencil-fill"
                 >
-                  <i class="bi bi-pencil-fill" />
                   {{ t('components.library.ArtistBase.button.edit') }}
                 </PopoverItem>
 
@@ -235,9 +234,10 @@ watch(() => props.id, fetchData, { immediate: true })
                 <PopoverItem
                   v-for="obj in getReportableObjects({artist: object})"
                   :key="obj.target.type + obj.target.id"
+                  icon="bi-share-fill"
                   @click="report(obj)"
                 >
-                  <i class="bi bi-share-fill" /> {{ obj.label }}
+                  {{ obj.label }}
                 </PopoverItem>
 
                 <hr>
@@ -245,18 +245,18 @@ watch(() => props.id, fetchData, { immediate: true })
                 <PopoverItem
                   v-if="store.state.auth.availablePermissions['library']"
                   :to="{name: 'manage.library.artists.detail', params: {id: object.id}}"
+                  icon="bi-wrench"
                 >
-                  <i class="bi bi-wrench" />
                   {{ t('components.library.ArtistBase.link.moderation') }}
                 </PopoverItem>
 
                 <PopoverItem
                   v-if="store.state.auth.profile && store.state.auth.profile.is_superuser"
-                  :href="store.getters['instance/absoluteUrl'](`/api/admin/music/artist/${object.id}`)"
+                  :to="store.getters['instance/absoluteUrl'](`/api/admin/music/artist/${object.id}`)"
                   target="_blank"
                   rel="noopener noreferrer"
+                  icon="bi-wrench"
                 >
-                  <i class="bi bi-wrench" />
                   {{ t('components.library.ArtistBase.link.django') }}
                 </PopoverItem>
               </template>