diff --git a/templates/content-comments_viewer.tpl.html b/templates/content-comments_viewer.tpl.html
index a715c7b..8e1253b 100644
--- a/templates/content-comments_viewer.tpl.html
+++ b/templates/content-comments_viewer.tpl.html
@@ -1,5 +1,4 @@
 <!--% PROCESS 'shared-episode-summary.tpl.html' %-->
-<!--% PROCESS 'shared-avatar.tpl.html' %-->
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 <!--% PROCESS 'shared-listen-now.tpl.html' %-->
 <!--% PROCESS "queries-episode-${constants.database}.tpl.html" %-->
diff --git a/templates/content-correspondent.tpl.html b/templates/content-correspondent.tpl.html
index 2b677a2..afe67a6 100644
--- a/templates/content-correspondent.tpl.html
+++ b/templates/content-correspondent.tpl.html
@@ -55,8 +55,7 @@
 		<!--% this_host = hosts.$id %-->
 		<h2 class="title">Correspondent</h2>
 		<h2><!--% this_host.host %--></h2>
-		<p><img src="<!--% absolute_path(baseurl) %-->images/<!--% get_avatar(this_host.hostid) %-->" 
-				height="80" alt="Host Image" /><br>
+		<p><!--% get_avatar(this_host.hostid, this_host.host) %--><br>
 		<label>Host ID</label>: <!--% this_host.hostid %--><br><br>
 		<label>email:</label> <u><!--% this_host.email %--></u><br>
 		<label>episodes:</label> <strong><!--% hpr_show_count + twat_show_count %--></strong>
diff --git a/templates/content-correspondents.tpl.html b/templates/content-correspondents.tpl.html
index 25847d2..dce4335 100644
--- a/templates/content-correspondents.tpl.html
+++ b/templates/content-correspondents.tpl.html
@@ -1,9 +1,10 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
+<!--% PROCESS 'shared-avatar.tpl.html' %-->
 <article>
 	<h2 class="title">Correspondents</h2>
 	<p>For more information on how to become a Correspondent see our <a href="<!--% absolute_path(baseurl) %-->contribute.html">contribute</a></center> page. To add a logo here, either email one to admin at hpr or setup your email on <a href="https://en.gravatar.com/">Gravatar</a>. To protect your browsing privacy we gather the images every hour and serve them directly from HPR.<p />
 <!--% USE DBI(constants.driver, constants.user, constants.password) %-->
-<!--% PROCESS 'shared-avatar.tpl.html' %-->
+<!--% host_cnt = 0 %-->
 	<table class="hosts">
 	<th >Avatar</th>
 	<th >Name &amp; Host ID</th>
@@ -17,14 +18,14 @@
 		on h.hostid = e.hostid '
 	) %-->
 	<tr height="80">
-	<td><img src="<!--% absolute_path(baseurl) %-->images/<!--% get_avatar(host.hostid) %-->" height="80" width="80" alt="avatar" /></td>
+	<td><!--% get_avatar(host.hostid, host.host, host_cnt > 8) %--></td>
 
 		<td><strong><!--% host.host %--></strong><br>
 
 			Host ID: <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(host.hostid) %-->.html"><!--% host.hostid %--></a></td>
 		<td><!--% host.license %--></td>
 		<td><!--% host.date %--></td>
-	</tr>
+	</tr><!--% host_cnt = host_cnt + 1 %-->
 	<!--% END %-->
 	</table>
 	<p><a href="<!--% absolute_path(baseurl) %-->contribute.html">Become a Correspondent</a></p>
diff --git a/templates/content-episode.tpl.html b/templates/content-episode.tpl.html
index b4d1040..dc446f1 100644
--- a/templates/content-episode.tpl.html
+++ b/templates/content-episode.tpl.html
@@ -16,8 +16,7 @@
 		<h3><!--% episode.summary %--></h3>
 		<p class="meta"><!--% episode_navigation %-->
 		</p>
-<p><!--% IF get_avatar(episode.hostid) != 'hpr_logo.png' %-->
-<img src="<!--% absolute_path(baseurl) %-->images/<!--% get_avatar(episode.hostid) %-->" height="80" width="80" alt="" /></a><br><!--% END %-->
+<p><!--% show_avatar(episode.hostid, episode.host) %-->
 Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(episode.hostid) %-->.html"><!--% episode.host %--></a> on <span><!--% episode.date %--></span> is flagged as <span><!--% display_explicit(episode.explicit) %--></span> and is released under a <span><!--% episode.license %--> license</span>. <br>
 <!--% display_tags(episode.tags) %--> <br>
 <!--% display_listen_in(episode.id) %--> | 
diff --git a/templates/content-index.tpl.html b/templates/content-index.tpl.html
index 9116754..7d7331e 100644
--- a/templates/content-index.tpl.html
+++ b/templates/content-index.tpl.html
@@ -1,5 +1,4 @@
 <!--% 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' %-->
@@ -44,11 +43,8 @@
 	<header>
 			<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' %-->
-			<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>
+		<p class="meta"$><!--% show_avatar(latest_episodes.hostid, latest_episodes.host, host_cnt) %-->
+	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) %--> | 
 <!--% display_comments_tally(latest_episodes.id, latest_episodes.eps_tally) %--></small>
diff --git a/templates/content-twat_episode.tpl.html b/templates/content-twat_episode.tpl.html
index a408bea..ae844d3 100644
--- a/templates/content-twat_episode.tpl.html
+++ b/templates/content-twat_episode.tpl.html
@@ -52,8 +52,7 @@
 		<h3><!--% episode.summary %--></h3>
 		<p class="meta"><!--% episode_navigation %-->
 		</p>
-<p><!--% IF get_avatar(episode.hostid) != 'hpr_logo.png' %-->
-<img src="<!--% absolute_path(baseurl) %-->images/<!--% get_avatar(episode.hostid) %-->" height="80" width="80" alt="" /></a><br><!--% END %-->
+<p><!--% show_avatar(episode.hostid, episode.host) %-->
 Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(episode.hostid) %-->.html"><!--% episode.host %--></a> on <span><!--% episode.date %--></span> is flagged as <span><!--% display_explicit(episode.explicit) %--></span> and is released under a <span><!--% episode.license %--> license</span>. <br>
 <!--% display_tags(episode.tags) %--> <br>
 <!--% display_listen_in(episode.id, "twat") %-->  
diff --git a/templates/host-thumbnail.tpl.html b/templates/host-thumbnail.tpl.html
deleted file mode 100644
index a7dda96..0000000
--- a/templates/host-thumbnail.tpl.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!--% 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 %-->
diff --git a/templates/shared-avatar.tpl.html b/templates/shared-avatar.tpl.html
index ffda253..41f21d3 100644
--- a/templates/shared-avatar.tpl.html
+++ b/templates/shared-avatar.tpl.html
@@ -1,5 +1,16 @@
-<!--% MACRO get_avatar(host_id) BLOCK  %-->
+<!--% MACRO lazy_load(is_lazy) BLOCK %-->
+<!--% IF is_lazy %-->loading="lazy"<!--% END %-->
+<!--% END %-->
+<!--% MACRO get_avatar_src(host_id) BLOCK  %-->
 <!--% TRY %-->
 <!--% USE File ("./public_html/images/hosts/${host_id}.png") %-->hosts/<!--% File.name %-->
 <!--% CATCH File %-->hpr_logo.png<!--% END %-->
 <!--% END %-->
+<!--% MACRO get_avatar(host_id, host_name, is_lazy_loaded) BLOCK %-->
+<img src="<!--% absolute_path(baseurl) %-->images/<!--% get_avatar_src(host_id) %-->" height="80" width="80" alt="Thumbnail of <!--% host_name | html %-->" <!--% lazy_load(is_lazy_loaded) %--> />
+<!--% END %-->
+<!--% MACRO show_avatar(host_id, host_name, is_lazy_loaded) BLOCK %-->
+<!--% IF get_avatar_src(host_id) != 'hpr_logo.png' %-->
+<a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(host_id) %-->.html"><!--% get_avatar(host_id, host_name, is_lazy_loaded) %--></a><br>
+<!--% END %-->
+<!--% END %-->