2 files changed, 2 insertions, 1 deletions
diff --git a/views/default/icon/object/album.php b/views/default/icon/object/album.php
index 656b2e0df..55bb7451b 100644
--- a/views/default/icon/object/album.php
+++ b/views/default/icon/object/album.php
@@ -17,6 +17,7 @@ $album = $vars['entity'];
 $cover_guid = $album->getCoverImageGuid();
 if ($cover_guid) {
 	$vars['title'] = $album->getTitle();
+	$vars['href'] = $album->getURL();
 	echo elgg_view_entity_icon(get_entity($cover_guid), $vars['size'], $vars);
 } else {
 	$url = "mod/tidypics/graphics/empty_album.png";
diff --git a/views/default/icon/object/image.php b/views/default/icon/object/image.php
index 3dbced8ab..9087fc3d8 100644
--- a/views/default/icon/object/image.php
+++ b/views/default/icon/object/image.php
@@ -27,7 +27,7 @@ if (!isset($vars['title'])) {
 	$title = $vars['title'];
 }
 
-$url = $entity->getURL();
+$url = isset($vars['href']) ? $vars['href'] : $entity->getURL();
 if (isset($vars['href'])) {
 	$url = $vars['href'];
 }