diff --git a/front/src/components/audio/PlayButton.vue b/front/src/components/audio/PlayButton.vue
index 0617d971f..4a04f7232 100644
--- a/front/src/components/audio/PlayButton.vue
+++ b/front/src/components/audio/PlayButton.vue
@@ -106,6 +106,7 @@ const isOpen = ref(false)
   >
     <OptionsButton
       v-if="dropdownOnly"
+      v-bind="$attrs"
       @click="isOpen = !isOpen"
       :isGhost="discrete"
     />
diff --git a/front/src/components/audio/track/Widget.vue b/front/src/components/audio/track/Widget.vue
index 0413af409..ed89902af 100644
--- a/front/src/components/audio/track/Widget.vue
+++ b/front/src/components/audio/track/Widget.vue
@@ -17,6 +17,7 @@ import Section from '~/components/ui/Section.vue'
 import Alert from '~/components/ui/Alert.vue'
 import Spacer from '~/components/ui/Spacer.vue'
 import Loader from '~/components/ui/Loader.vue'
+import Heading from '~/components/ui/Heading.vue'
 
 import useErrorHandler from '~/composables/useErrorHandler'
 
@@ -108,127 +109,126 @@ watch(() => props.websocketHandlers.includes('Listen'), (to) => {
 
 <template>
 <!-- TODO: Use activity.vue -->
-  <div class="component-track-widget">
-    <h2 v-if="!!$slots.title">
-      <slot name="title" />
-      <span
-        v-if="showCount"
-        class="ui tiny circular label"
-      >{{ count }}</span>
-    </h2>
-    <Alert
-      v-if="count === 0"
-      blue
-      style="text-align: center;"
-    >
-      <i class="bi bi-music-note-list" />
-      {{ t('components.audio.track.Widget.empty.noResults') }}
-      <Loader v-if="isLoading" />
-    </Alert>
-    <Section
-      v-if="count > 0"
-      medium-items
-    >
-      <div class="funkwhale activity"
-        v-for="object in objects"
-        :key="object.id"
-        :class="['item', itemClasses]"
-      >
-        <div class="activity-image">
-          <img
-            v-if="object.track.album && object.track.album.cover"
-            v-lazy="store.getters['instance/absoluteUrl'](object.track.album.cover.urls.medium_square_crop)"
-            alt=""
-          >
-          <img
-            v-else-if="object.track.cover"
-            v-lazy="store.getters['instance/absoluteUrl'](object.track.cover.urls.medium_square_crop)"
-            alt=""
-          >
-          <img
-            v-else-if="object.track.artist_credit && object.track.artist_credit.length > 1"
-            v-lazy="getArtistCoverUrl(object.track.artist_credit)"
-            alt=""
-          >
-          <i
-            v-else
-            class="bi bi-vinyl-fill"
-          />
-          <!-- TODO: Add Playbutton overlay -->
-        </div>
-        <div class="activity-content">
-          <div class="track-title">
-            <router-link
-              class="funkwhale link artist"
-              :to="{name: 'library.tracks.detail', params: {id: object.track.id}}"
-            >
-              {{ object.track.title }}
-            </router-link>
-          </div>
-          <div
-            v-if="object.track.artist_credit"
-            class="funkwhale link artist"
-          >
-            <span
-              v-for="ac in object.track.artist_credit"
-              :key="ac.artist.id"
-            >
-              <router-link
-                class="discrete link"
-                :to="{ name: 'library.artists.detail', params: { id: ac.artist.id } }"
-              >
-                {{ ac.credit }}
-              </router-link>
-              <span v-if="ac.joinphrase">{{ ac.joinphrase }}</span>
-            </span>
-          </div>
-          <TagsList
-            label-classes="tiny"
-            :truncate-size="20"
-            :limit="2"
-            :show-more="false"
-            :tags="object.track.tags"
-          />
-
-          <div
-            v-if="isActivity"
-            class="extra"
-          >
-            <router-link
-              class="funkwhale link user"
-              :to="{name: 'profile.overview', params: {username: object.actor.name}}"
-            >
-              <span class="at symbol" />{{ object.actor.name }}
-            </router-link>
-            <span class="right floated"><human-date :date="object.creation_date" /></span>
-          </div>
-        </div>
-        <play-button
-          :account="object.actor"
-          :dropdown-only="true"
-          :track="object.track"
-        />
-      </div>
-    </Section>
+  <h2 v-if="!!$slots.title">
+    <slot name="title" />
+    <span
+      v-if="showCount"
+      class="ui tiny circular label"
+    >{{ count }}</span>
+  </h2>
+  <Alert
+    v-if="count === 0"
+    blue
+    style="text-align: center;"
+  >
+    <i class="bi bi-music-note-list" />
+    {{ t('components.audio.track.Widget.empty.noResults') }}
     <Loader v-if="isLoading" />
-    <template v-if="nextPage">
-      <Spacer :size="16"/>
-      <Button
-        primary
-        @click="fetchData(nextPage as string)"
-      >
-        {{ t('components.audio.track.Widget.button.more') }}
-      </Button>
-    </template>
-  </div>
+  </Alert>
+  <template
+    v-if="count > 0"
+    medium-items
+  >
+    <div class="funkwhale activity"
+      v-for="object in objects"
+      :key="object.id"
+      :class="['item', itemClasses]"
+    >
+      <div class="activity-image">
+        <img
+          v-if="object.track.album && object.track.album.cover"
+          v-lazy="store.getters['instance/absoluteUrl'](object.track.album.cover.urls.medium_square_crop)"
+          alt=""
+        >
+        <img
+          v-else-if="object.track.cover"
+          v-lazy="store.getters['instance/absoluteUrl'](object.track.cover.urls.medium_square_crop)"
+          alt=""
+        >
+        <img
+          v-else-if="object.track.artist_credit && object.track.artist_credit.length > 1"
+          v-lazy="getArtistCoverUrl(object.track.artist_credit)"
+          alt=""
+        >
+        <i
+          v-else
+          class="bi bi-vinyl-fill"
+        />
+        <!-- TODO: Add Playbutton overlay -->
+      </div>
+      <div class="activity-content">
+          <router-link
+            class="funkwhale link artist"
+            :to="{name: 'library.tracks.detail', params: {id: object.track.id}}"
+          >
+            <Heading :h3="object.track.title" title />
+          </router-link>
+          <Spacer :size="2"/>
+        <div
+          v-if="object.track.artist_credit"
+          class="funkwhale link artist"
+        >
+          <span
+            v-for="ac in object.track.artist_credit"
+            :key="ac.artist.id"
+          >
+            <router-link
+              class="discrete link"
+              :to="{ name: 'library.artists.detail', params: { id: ac.artist.id } }"
+            >
+              {{ ac.credit }}
+            </router-link>
+            <span v-if="ac.joinphrase">{{ ac.joinphrase }}</span>
+          </span>
+        </div>
+        <TagsList
+          label-classes="tiny"
+          :truncate-size="20"
+          :limit="2"
+          :show-more="false"
+          :tags="object.track.tags"
+        />
+        <Spacer :size="4"/>
+        <div
+          v-if="isActivity"
+          class="extra"
+        >
+          <router-link
+            class="funkwhale link user"
+            :to="{name: 'profile.overview', params: {username: object.actor.name}}"
+          >
+            <span class="at symbol" />{{ object.actor.name }}
+          </router-link>
+          <span class="right floated"><human-date :date="object.creation_date" /></span>
+        </div>
+      </div>
+      <play-button
+        :account="object.actor"
+        :dropdown-only="true"
+        :track="object.track"
+        square-small
+      />
+    </div>
+  </template>
+  <Loader v-if="isLoading" />
+  <template v-if="nextPage">
+    <Spacer :size="16"/>
+    <Button
+      primary
+      @click="fetchData(nextPage as string)"
+    >
+      {{ t('components.audio.track.Widget.button.more') }}
+    </Button>
+  </template>
 </template>
 
 
 <style lang="scss" scoped>
 .funkwhale {
   &.activity {
-    padding: 12px 0;
+    padding-top: 14px;
     border-top: 1px solid;
+    margin: -11px 0;
 
     @include light-theme {
       border-color: var(--fw-gray-300);
@@ -259,7 +259,8 @@ watch(() => props.websocketHandlers.includes('Listen'), (to) => {
       }
 
       > i {
-        font-size: 36px;
+        font-size: 40px;
+        line-height: 36px;
       }
 
       > .play-button {
diff --git a/front/src/components/library/Home.vue b/front/src/components/library/Home.vue
index dfd0f35a4..af8245b69 100644
--- a/front/src/components/library/Home.vue
+++ b/front/src/components/library/Home.vue
@@ -90,20 +90,22 @@ fetchData()
   <Section
     alignLeft
     :h2="t('components.library.Home.header.recentlyListened')"
-  />
+  >
     <track-widget
       :url="'history/listenings/'"
       :filters="{ scope, ordering: '-creation_date', ...qualityFilters}"
       :websocket-handlers="['Listen']"
     />
+  </Section>
   <Section
     alignLeft
     :h2="t('components.library.Home.header.recentlyFavorited')"
-  />
+  >
     <track-widget
       :url="'favorites/tracks/'"
       :filters="{scope: scope, ordering: '-creation_date'}"
     />
+  </Section>
   <Section
     alignLeft
     :h2="t('components.library.Home.header.recentlyAdded')"
diff --git a/front/src/components/ui/Heading.vue b/front/src/components/ui/Heading.vue
index 173c93d94..835d86fd9 100644
--- a/front/src/components/ui/Heading.vue
+++ b/front/src/components/ui/Heading.vue
@@ -8,7 +8,7 @@ const size = Object.entries(props).find(([key, value]) => value && key!==level)?
 </script>
 
 <template>
-  <component :is="level" :class="size" style="margin: 0; padding:0; line-height: 40px; vertical-align: baseline;">
+  <component :is="level" :class="size" style="margin: 0; padding: 0; vertical-align: baseline;">
     {{ title }}
     <slot />
   </component>
@@ -28,7 +28,7 @@ const size = Object.entries(props).find(([key, value]) => value && key!==level)?
   .caption {font-size: 14px; font-weight: 600; letter-spacing: .25px; }
 
   /* Tab title, Channel title, Card title, Activity title */
-  .title { font-size: 16px; font-weight: 700;  }
+  .title { font-size: 16px; font-weight: 700; line-height: 18px; }
 
   /* Primary radio title */
   .radio { font-size: 28px; font-weight: 900; letter-spacing: -.5px; }
diff --git a/front/src/components/ui/button/Options.vue b/front/src/components/ui/button/Options.vue
index 84ae29691..e32804e6d 100644
--- a/front/src/components/ui/button/Options.vue
+++ b/front/src/components/ui/button/Options.vue
@@ -15,6 +15,7 @@ const props = withDefaults(defineProps<Props>(), {
 <template>
   <Button
     icon="bi-three-dots-vertical"
+    v-bind="$attrs"
     :class="['options-button', {'is-ghost': isGhost}]"
     :secondary="!isGhost"
     :ghost="isGhost"