diff --git a/templates/content-index.tpl.html b/templates/content-index.tpl.html
index 69c98f5..9116754 100644
--- a/templates/content-index.tpl.html
+++ b/templates/content-index.tpl.html
@@ -1,4 +1,5 @@
 <!--% PROCESS 'shared-avatar.tpl.html' %-->
+<!--% PROCESS 'host-thumbnail.tpl.html' %-->
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 <!--% PROCESS 'shared-listen-now.tpl.html' %-->
 <!--% PROCESS 'shared-show-transcript.tpl.html' %-->
@@ -35,6 +36,7 @@
   <hr>
   <!--% PROCESS 'shared-episode-summary.tpl.html' %-->
 <h1>Latest Shows</h1>
+<!--% host_cnt = 0 %-->
 <!--% FOREACH latest_episodes IN DBI.query(query_latest_episodes)
 %-->
 <hr>
@@ -43,7 +45,9 @@
 			<h1><a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(latest_episodes.id) %-->/index.html">hpr<!--% latest_episodes.id %--> :: <!--% latest_episodes.title %--></a></h1>
 		<h3><!--% latest_episodes.summary%--></h3>
 		<p class="meta"$><!--% IF get_avatar(latest_episodes.hostid) != 'hpr_logo.png' %-->
-		<img src="<!--% absolute_path(baseurl) %-->images/<!--% get_avatar(latest_episodes.hostid) %-->" height="80" width="80" alt="" /></a><!--% END %-->
+			<a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(latest_episodes.hostid) %-->.html">
+				<!--% host_thumb(get_avatar(latest_episodes.hostid), latest_episodes.host, host_cnt) %-->
+			</a><!--% END %-->
 	<br>Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(latest_episodes.hostid) %-->.html"><!--% latest_episodes.host %--></a> on <!--% latest_episodes.date %--> is flagged as <!--% display_explicit(latest_episodes.explicit) %--> and released under a <!--% latest_episodes.license %--> license. <br>
 <!--% display_tags(latest_episodes.tags) %--><br>
 <small><!--% display_listen_in(latest_episodes.id) %--> <!--% show_series(latest_episodes.series, latest_episodes.seriesid) %--> | 
@@ -57,6 +61,7 @@
 	<!--% listen_now(latest_episodes, "hpr", baseurl, media_baseurl) %-->
 	</footer>
 </article>
+<!--% host_cnt = host_cnt + 1 %-->
 <!--% END %-->
 <article>
     <header>
diff --git a/templates/host-thumbnail.tpl.html b/templates/host-thumbnail.tpl.html
new file mode 100644
index 0000000..a7dda96
--- /dev/null
+++ b/templates/host-thumbnail.tpl.html
@@ -0,0 +1,3 @@
+<!--% MACRO host_thumb(avatar, host_name, host_cnt) BLOCK %-->
+<img src="<!--% absolute_path(baseurl) %-->images/<!--% avatar %-->" height="80" width="80" alt="Thumbnail of <!--% host_name | html %-->" <!--% IF host_cnt %-->loading="lazy"<!--% END %--> />
+<!--% END %-->