diff --git a/front/src/components/audio/album/Card.vue b/front/src/components/audio/album/Card.vue
index 67d1eb706..1736191d0 100644
--- a/front/src/components/audio/album/Card.vue
+++ b/front/src/components/audio/album/Card.vue
@@ -1,109 +1,51 @@
 <template>
-    <div :class="['ui', 'card', mode]">
-      <div class="content">
-        <div class="right floated tiny ui image">
-          <img v-if="album.cover.original" v-lazy="$store.getters['instance/absoluteUrl'](album.cover.square_crop)">
-          <img v-else src="../../../assets/audio/default-cover.png">
-        </div>
-        <div class="header">
-          <router-link class="discrete link" :to="{name: 'library.albums.detail', params: {id: album.id }}">{{ album.title }} </router-link>
-        </div>
-        <div class="meta">
-          <span>
-            <router-link :title="album.artist.name" tag="span" :to="{name: 'library.artists.detail', params: {id: album.artist.id }}">
-              <span v-translate="{artist: album.artist.name}" translate-context="Content/Album/Card" :translate-params="{artist: album.artist.name}">By %{ artist }</span>
-            </router-link>
-          </span><span class="time" v-if="album.release_date">– {{ album.release_date | year }}</span>
-        </div>
-        <div class="description" v-if="mode === 'rich'">
-          <table class="ui very basic fixed single line compact unstackable table">
-            <tbody>
-              <tr v-for="track in tracks">
-                <td class="play-cell">
-                  <play-button :class="['basic', {orange: currentTrack && isPlaying && track.id === currentTrack.id}, 'icon']" :discrete="true" :track="track"></play-button>
-                </td>
-                <td class="content-cell" colspan="5">
-                  <track-favorite-icon :track="track"></track-favorite-icon>
-                  <router-link :title="track.title" class="track discrete link" :to="{name: 'library.tracks.detail', params: {id: track.id }}">
-                    <template v-if="track.position">
-                      {{ track.position }}.
-                    </template>
-                    {{ track.title }}
-                  </router-link>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-          <div class="center aligned segment" v-if="album.tracks.length > initialTracks">
-            <em v-if="!showAllTracks" @click="showAllTracks = true" class="expand">
-              <translate translate-context="Content/Album/Card.Link/Verb" :translate-params="{count: album.tracks.length - initialTracks}" :translate-n="album.tracks.length - initialTracks" translate-plural="Show %{ count } more tracks">Show %{ count } more track</translate>
-            </em>
-            <em v-else @click="showAllTracks = false" class="expand">
-              <translate translate-context="*/*/Button,Label">Collapse</translate>
-            </em>
-          </div>
-        </div>
-      </div>
-      <div class="extra content">
-        <play-button class="mini basic orange right floated" :tracks="tracksWithAlbum" :album="album">
-          <translate translate-context="Content/Queue/Button.Label/Short, Verb">Play all</translate>
-        </play-button>
+  <div class="card app-card">
+    <div
+      @click="$router.push({name: 'library.albums.detail', params: {id: album.id}})"
+      :class="['ui', 'image', {'default-cover': !album.cover.original}]" v-lazy:background-image="imageUrl">
+      <play-button :icon-only="true" :is-playable="album.is_playable" :button-classes="['ui', 'circular', 'large', 'orange', 'icon', 'button']" :album="album"></play-button>
+    </div>
+    <div class="content">
+      <strong>
+        <router-link class="discrete link" :title="album.title" :to="{name: 'library.albums.detail', params: {id: album.id}}">
+          {{ album.title }}
+        </router-link>
+      </strong>
+      <div class="description">
         <span>
-          <i class="music icon"></i>
-          <translate translate-context="*/*/*" :translate-params="{count: album.tracks.length}" :translate-n="album.tracks.length" translate-plural="%{ count } tracks">%{ count } track</translate>
+          <router-link :title="album.artist.name" class="discrete link" :to="{name: 'library.artists.detail', params: {id: album.artist.id}}">
+            {{ album.artist.name }}
+          </router-link>
         </span>
       </div>
     </div>
+    <div class="extra content">
+      <translate translate-context="*/*/*" :translate-params="{count: album.tracks.length}" :translate-n="album.tracks.length" translate-plural="%{ count } tracks">%{ count } track</translate>
+      <play-button class="right floated basic icon" :dropdown-only="true" :is-playable="album.is_playable" :dropdown-icon-classes="['ellipsis', 'horizontal', 'large', 'grey']" :album="album"></play-button>
+    </div>
+  </div>
 </template>
 
 <script>
-import { mapGetters } from "vuex"
-import backend from '@/audio/backend'
-import TrackFavoriteIcon from '@/components/favorites/TrackFavoriteIcon'
 import PlayButton from '@/components/audio/PlayButton'
 
 export default {
   props: {
     album: {type: Object},
-    mode: {type: String, default: 'rich'},
   },
   components: {
-    TrackFavoriteIcon,
     PlayButton
   },
-  data () {
-    return {
-      backend: backend,
-      initialTracks: 5,
-      showAllTracks: false
-    }
-  },
   computed: {
-    tracks () {
-      if (this.showAllTracks) {
-        return this.album.tracks
+    imageUrl () {
+      let url = '../../../assets/audio/default-cover.png'
+
+      if (this.album.cover.original) {
+        url = this.$store.getters['instance/absoluteUrl'](this.album.cover.medium_square_crop)
+      } else {
+        return null
       }
-      return this.album.tracks.slice(0, this.initialTracks)
-    },
-    ...mapGetters({
-      currentTrack: "queue/currentTrack",
-    }),
-    isPlaying () {
-      return this.$store.state.player.playing
-    },
-    tracksWithAlbum () {
-      // needed to include album data (especially cover)
-      // with tracks appended in queue (#795)
-      let self = this
-      return this.album.tracks.map(t => {
-        return  {
-          ...t,
-          album: {
-            ...self.album,
-            tracks: []
-          }
-        }
-      })
+      return url
     }
   }
 }
@@ -111,35 +53,9 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped lang="scss">
-.content-cell {
-  .link,
-  .button {
-    padding: 0.5em 0;
-  }
-  .link {
-    margin-left: 0.5em;
-    display: block;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-}
-tr {
-  .favorite-icon:not(.favorited) {
-    visibility: hidden;
-  }
-  &:hover .favorite-icon {
-    visibility: visible;
-  }
-  .favorite-icon {
-    float: right;
-  }
-}
-.expand {
-  cursor: pointer;
+
+.default-cover {
+  background-image: url("../../../assets/audio/default-cover.png") !important;
 }
 
-.ui .card.rich {
-  align-self: flex-start;
-}
 </style>
diff --git a/front/src/components/audio/album/Widget.vue b/front/src/components/audio/album/Widget.vue
index e5ee7f742..b0d381a68 100644
--- a/front/src/components/audio/album/Widget.vue
+++ b/front/src/components/audio/album/Widget.vue
@@ -9,31 +9,11 @@
     <button v-if="controls" :disabled="!nextPage" @click="fetchData(nextPage)" :class="['ui', {disabled: !nextPage}, 'circular', 'icon', 'basic', 'button']"><i :class="['ui', 'angle right', 'icon']"></i></button>
     <button v-if="controls" @click="fetchData('albums/')" :class="['ui', 'circular', 'icon', 'basic', 'button']"><i :class="['ui', 'refresh', 'icon']"></i></button>
     <div class="ui hidden divider"></div>
-    <div class="ui five cards">
+    <div class="ui app-cards cards">
       <div v-if="isLoading" class="ui inverted active dimmer">
         <div class="ui loader"></div>
       </div>
-      <div class="card" v-for="album in albums" :key="album.id">
-        <div :class="['ui', 'image', 'with-overlay', {'default-cover': !album.cover.original}]" v-lazy:background-image="getImageUrl(album)">
-          <play-button class="play-overlay" :icon-only="true" :is-playable="album.is_playable" :button-classes="['ui', 'circular', 'large', 'orange', 'icon', 'button']" :album="album"></play-button>
-        </div>
-        <div class="content">
-          <router-link :title="album.title" :to="{name: 'library.albums.detail', params: {id: album.id}}">
-            {{ album.title|truncate(25) }}
-          </router-link>
-          <div class="description">
-            <span>
-              <router-link :title="album.artist.name" class="discrete link" :to="{name: 'library.artists.detail', params: {id: album.artist.id}}">
-                {{ album.artist.name|truncate(23) }}
-              </router-link>
-            </span>
-          </div>
-        </div>
-        <div class="extra content">
-          <human-date class="left floated" :date="album.creation_date"></human-date>
-          <play-button class="right floated basic icon" :dropdown-only="true" :is-playable="album.is_playable" :dropdown-icon-classes="['ellipsis', 'horizontal', 'large', 'grey']" :album="album"></play-button>
-        </div>
-      </div>
+      <album-card v-for="album in albums" :album="album" :key="album.id" />
     </div>
     <template v-if="!isLoading && albums.length === 0">
       <div class="ui placeholder segment">
@@ -49,7 +29,7 @@
 <script>
 import _ from '@/lodash'
 import axios from 'axios'
-import PlayButton from '@/components/audio/PlayButton'
+import AlbumCard from '@/components/audio/album/Card'
 
 export default {
   props: {
@@ -59,7 +39,7 @@ export default {
     limit: {type: Number, default: 12},
   },
   components: {
-    PlayButton
+    AlbumCard
   },
   data () {
     return {
@@ -102,16 +82,6 @@ export default {
         this.offset = Math.max(this.offset - this.limit, 0)
       }
     },
-    getImageUrl (album) {
-      let url = '../../../assets/audio/default-cover.png'
-
-      if (album.cover.original) {
-        url = this.$store.getters['instance/absoluteUrl'](album.cover.medium_square_crop)
-      } else {
-        return null
-      }
-      return url
-    }
   },
   watch: {
     offset () {
@@ -124,11 +94,7 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import "../../../style/vendor/media";
 
-.default-cover {
-  background-image: url("../../../assets/audio/default-cover.png") !important;
-}
 
 .wrapper {
   width: 100%;
@@ -136,18 +102,6 @@ export default {
 .ui.cards {
   justify-content: flex-start;
 }
-.ui.five.cards > .card {
-  width: 15em;
-}
-.with-overlay {
-  background-size: cover !important;
-  background-position: center !important;
-  height: 15em;
-  width: 15em;
-  display: flex !important;
-  justify-content: center !important;
-  align-items: center !important;
-}
 </style>
 <style>
 .ui.cards .ui.button {
diff --git a/front/src/components/library/Albums.vue b/front/src/components/library/Albums.vue
index 2fd3ec783..8508762cc 100644
--- a/front/src/components/library/Albums.vue
+++ b/front/src/components/library/Albums.vue
@@ -51,10 +51,8 @@
         class="ui stackable three column doubling grid">
         <div
           v-if="result.results.length > 0"
-          class="ui cards">
+          class="ui app-cards cards">
           <album-card
-            :mode="'simple'"
-            v-masonry-tile
             v-for="album in result.results"
             :key="album.id"
             :album="album"></album-card>
diff --git a/front/src/components/library/ArtistDetail.vue b/front/src/components/library/ArtistDetail.vue
index 1dfbdd0d2..725bedac0 100644
--- a/front/src/components/library/ArtistDetail.vue
+++ b/front/src/components/library/ArtistDetail.vue
@@ -21,8 +21,8 @@
       <h2>
         <translate translate-context="Content/Artist/Title">Albums by this artist</translate>
       </h2>
-      <div class="ui cards">
-        <album-card :mode="'rich'" :album="album" :key="album.id" v-for="album in allAlbums"></album-card>
+      <div class="ui cards app-cards">
+        <album-card :album="album" :key="album.id" v-for="album in allAlbums"></album-card>
       </div>
       <div class="ui hidden divider"></div>
       <button :class="['ui', {loading: isLoadingMoreAlbums}, 'button']" v-if="nextAlbumsUrl && loadMoreAlbumsUrl" @click="loadMoreAlbums(loadMoreAlbumsUrl)">
diff --git a/front/src/style/_main.scss b/front/src/style/_main.scss
index 06124c8f4..db2f0701a 100644
--- a/front/src/style/_main.scss
+++ b/front/src/style/_main.scss
@@ -438,5 +438,35 @@ input + .help {
     }
   }
 }
+.ui.cards.app-cards {
+  > .app-card {
+    display: inline-block;
+    width: 15em;
+    > .image {
+      background-size: cover !important;
+      background-position: center !important;
+      height: 15em;
+      width: 15em;
+      display: flex !important;
+      justify-content: flex-end !important;
+      align-items: flex-end !important;
+      padding: 0.5em;
+      .button {
+        margin: 0;
+      }
+    }
+    .extra {
+      border-top: 0 !important;
+    }
+    .content:not(.extra) {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    .floating.dropdown > .icon {
+      margin-right: 0;
+    }
+  }
+}
 @import "./themes/_light.scss";
 @import "./themes/_dark.scss";