diff --git a/layouts/partials/photos/list.html b/layouts/partials/photos/list.html
new file mode 100644
index 0000000..5d9a675
--- /dev/null
+++ b/layouts/partials/photos/list.html
@@ -0,0 +1,9 @@
+{{ $thumbnailResourcesNames := slice "thumbnail" "Thumbnail" "thumbnail.jpg" "Thumbnail.jpg" }}
+{{ with index .Params "thumbnail" }}
+    {{ $thumbnailResourcesNames = $thumbnailResourcesNames | append . }}
+{{ end }}
+
+{{ $imageResources := .Resources.ByType "image" }}
+{{ $photos := where $imageResources "Name" "not in" $thumbnailResourcesNames }}
+
+{{ return $photos }}
diff --git a/layouts/partials/images/photo_thumbnail.html b/layouts/partials/photos/thumbnail.html
similarity index 100%
rename from layouts/partials/images/photo_thumbnail.html
rename to layouts/partials/photos/thumbnail.html
diff --git a/layouts/photos/atom_entry.atom b/layouts/photos/atom_entry.atom
index 7603e5d..9d69922 100644
--- a/layouts/photos/atom_entry.atom
+++ b/layouts/photos/atom_entry.atom
@@ -1,11 +1,10 @@
-{{- $thumbnail := partial "images/photo_thumbnail.html" . -}}
+{{- $thumbnail := partial "photos/thumbnail.html" . -}}
 <entry>
   {{ partial "atom_entry_metadata.xml" . }}
   <link rel="enclosure" href="{{ $thumbnail.Permalink }}" type="{{ $thumbnail.MediaType }}" length="{{ len $thumbnail.Content }}" />
-  {{- $inlineThumbnail := partial "images/photo_thumbnail.html" (dict "Page" . "Width" 1280 "Height" 1280) -}}
   <content type="html">{{ `<![CDATA[` | safeHTML }}
-    {{- with $inlineThumbnail -}}
-    <img src="{{ .Permalink }}">
+    {{- range partial "photos/list.html" . -}}
+    <img src="{{ .Permalink }}"{{ with .Params.alt }} alt="{{ . }}"{{ end }}>
     {{- end -}}
     {{- .Content -}}
   ]]></content>
diff --git a/layouts/photos/li_thumbnail_in_grid.html b/layouts/photos/li_thumbnail_in_grid.html
index c766d5b..e35b156 100644
--- a/layouts/photos/li_thumbnail_in_grid.html
+++ b/layouts/photos/li_thumbnail_in_grid.html
@@ -1,6 +1,6 @@
-{{- $thumbnail := partial "images/photo_thumbnail.html" (dict "Page" . "Width" 600 "Height" 600) -}}
+{{- $thumbnail := partial "photos/thumbnail.html" (dict "Page" . "Width" 600 "Height" 600) -}}
 {{- $thumbnail = $thumbnail.Crop "600x600" -}}
 {{- $altText := $thumbnail.Params.alt -}}
 <a href="{{ .RelPermalink }}" title="{{ .Title }}">
-  <img src="{{ $thumbnail.RelPermalink }}" {{ with $altText }}alt="{{ . }}"{{ end }}>
+  <img src="{{ $thumbnail.RelPermalink }}"{{ with $altText }} alt="{{ . }}"{{ end }}>
 </a>
diff --git a/layouts/photos/rss_item.rss b/layouts/photos/rss_item.rss
index 751c950..9baafb0 100644
--- a/layouts/photos/rss_item.rss
+++ b/layouts/photos/rss_item.rss
@@ -1,8 +1,10 @@
-{{- $thumbnail := partial "images/photo_thumbnail.html" (dict "Page" . "Width" 1280 "Height" 1280) -}}
+{{- $thumbnail := partial "photos/thumbnail.html" (dict "Page" . "Width" 1280 "Height" 1280) -}}
 <item>
   {{ partial "rss_item_metadata.rss" . }}
   <description>{{ `<![CDATA[` | safeHTML }}
-    <img src="{{ $thumbnail.Permalink }}">
-    {{ .Content }}
+    {{- range (partial "photos/list.html" .) -}}
+    <img src="{{ .Permalink }}"{{ with .Params.alt }} alt="{{ . }}"{{ end }}>
+    {{- end -}}
+    {{- .Content -}}
   ]]></description>
 </item>
diff --git a/layouts/photos/single.html b/layouts/photos/single.html
index 8a1aeae..2eab4b2 100644
--- a/layouts/photos/single.html
+++ b/layouts/photos/single.html
@@ -3,13 +3,11 @@
 {{ end }}
 
 {{ define "main" }}
-{{- $photos := where (.Resources.ByType "image")
-               "Name" "not in" (slice "thumbnail" "Thumbnail" "thumbnail.jpg" "Thumbnail.jpg") -}}
-
 {{- if .Title -}}
   {{ partial "content_header.html" . }}
 {{- end -}}
 
+{{- $photos := partial "photos/list.html" . -}}
 {{ if eq (len $photos) 0 }}
   {{ errorf "Missing photo from photos page %q" .Path }}
 {{ end }}
diff --git a/layouts/shortcodes/photo.html b/layouts/shortcodes/photo.html
index cb3bd6f..d5e6fae 100644
--- a/layouts/shortcodes/photo.html
+++ b/layouts/shortcodes/photo.html
@@ -1,5 +1,5 @@
 {{- with $photoPage := $.Page.GetPage (printf "photos/%s" (.Get 0)) -}}
-  {{- $thumbnail := partial "images/photo_thumbnail.html" (dict "Page" . "Width" 1280 "Height" 1280) -}}
+  {{- $thumbnail := partial "photos/thumbnail.html" (dict "Page" . "Width" 1280 "Height" 1280) -}}
   {{- $altText := $thumbnail.Params.alt | default .Title -}}
   <a href="{{ .RelPermalink }}" title="{{ .Title }}">
     <img src="{{ $thumbnail.RelPermalink }}"{{ with $altText }} alt="{{ . }}"{{ end }}>