diff --git a/lib/class/album.class.php b/lib/class/album.class.php
index d40730cb..d092efff 100644
--- a/lib/class/album.class.php
+++ b/lib/class/album.class.php
@@ -824,7 +824,8 @@ class Album extends database_object implements library_item
         }
 
         if ($id !== null && $type !== null) {
-            Art::display($type, $id, $this->get_fullname(), $thumb, $this->link);
+            $title = '[' . ($this->f_album_artist_name ?: $this->f_artist) . '] ' . $this->f_name;
+            Art::display($type, $id, $title, $thumb, $this->link);
         }
     }
 
diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php
index 69845044..e1efd765 100644
--- a/templates/show_now_playing_row.inc.php
+++ b/templates/show_now_playing_row.inc.php
@@ -65,7 +65,12 @@
     ?>
 <div class="np_group" id="np_group_3">
   <div class="np_cell cel_albumart">
-      <?php Art::display('album', $media->album, $media->get_fullname(), 1, AmpConfig::get('web_path') . '/albums.php?action=show&album=' . $media->album);
+      <?php
+      $album = new Album($media->album);
+    if ($album->id) {
+        $album->format();
+        $album->display_art(1);
+    }
     ?>
   </div>
 </div>
diff --git a/templates/show_random_albums.inc.php b/templates/show_random_albums.inc.php
index aab02b49..66330f67 100644
--- a/templates/show_random_albums.inc.php
+++ b/templates/show_random_albums.inc.php
@@ -40,7 +40,7 @@ if ($albums) {
                     $thumb     = 11;
                     $show_play = false;
                 }
-                Art::display_item($album, $thumb, $album->link);
+                $album->display_art($thumb);
             } else {
                 ?>
             <a href="<?php $album->link;