diff --git a/templates/PhotoPage.php b/templates/PhotoPage.php
index 2fdfbafd..800c5218 100644
--- a/templates/PhotoPage.php
+++ b/templates/PhotoPage.php
@@ -65,11 +65,9 @@ class PhotoPage extends SubTemplate
 					<a href="', $this->photo->getUrl(), '">';
 
 		if ($this->photo->isPortrait())
-			echo '
-						<img src="', $this->photo->getThumbnailUrl(null, 960), '" alt="">';
+			echo $this->photo->getInlineImage(null, 960);
 		else
-			echo '
-						<img src="', $this->photo->getThumbnailUrl(1280, null), '" alt="">';
+			echo $this->photo->getInlineImage(1280, null);
 
 		echo '
 					</a>
diff --git a/templates/PhotosIndex.php b/templates/PhotosIndex.php
index 2d911294..1e8c7933 100644
--- a/templates/PhotosIndex.php
+++ b/templates/PhotosIndex.php
@@ -90,8 +90,14 @@ class PhotosIndex extends SubTemplate
 					<a class="edit" href="', BASEURL, '/editasset/?id=', $image->getId(), '">Edit</a>';
 
 		echo '
-					<a href="', $image->getPageUrl(), $this->url_suffix, '">
-						<img src="', $image->getThumbnailUrl($width, $height, $crop, $fit), '" alt="" title="', $image->getTitle(), '">';
+					<a href="', $image->getPageUrl(), $this->url_suffix, '#photo_frame">
+						<img src="', $image->getThumbnailUrl($width, $height, $crop, $fit), '"';
+
+		// Can we offer double-density thumbs?
+		if ($image->width() >= $width * 2 && $image->height() >= $height * 2)
+			echo ' srcset="', $image->getThumbnailUrl($width * 2, $height * 2, $crop, $fit), ' 2x"';
+
+		echo ' alt="" title="', $image->getTitle(), '">';
 
 		if ($this->show_labels)
 			echo '