diff --git a/cmd/install/install.go b/cmd/install/install.go
index ba830969..dc5b419d 100644
--- a/cmd/install/install.go
+++ b/cmd/install/install.go
@@ -128,7 +128,7 @@ func main() {
 		"MinifyTemplates":true,
 		"BuildSlugs":true,
 		"ServerCount":1,
-		"Noavatar":"https://api.adorable.io/avatars/{width}/{id}@{site_url}.png",
+		"Noavatar":"https://api.adorable.io/avatars/{width}/{id}.png",
 		"ItemsPerPage":25
 	},
 	"Database": {
diff --git a/config/config_example.json b/config/config_example.json
index 18ba2240..73c567fc 100644
--- a/config/config_example.json
+++ b/config/config_example.json
@@ -30,7 +30,7 @@
 		"MinifyTemplates":true,
 		"BuildSlugs":true,
 		"ServerCount":1,
-		"Noavatar":"https://api.adorable.io/avatars/{width}/{id}@{site_url}.png",
+		"Noavatar":"https://api.adorable.io/avatars/{width}/{id}.png",
 		"ItemsPerPage":25
 	},
 	"Database": {
diff --git a/templates/forum.html b/templates/forum.html
index cc984244..ba83ef6b 100644
--- a/templates/forum.html
+++ b/templates/forum.html
@@ -41,7 +41,7 @@
 	{{if .CurrentUser.Perms.CreateTopic}}
 	<div id="forum_topic_create_form" class="rowblock topic_create_form quick_create_form" style="display: none;" aria-label="{{lang "quick_topic.aria"}}">
 		<form id="quick_post_form" enctype="multipart/form-data" action="/topic/create/submit/" method="post"></form>
-		<img class="little_row_avatar" src="{{.CurrentUser.Avatar}}" height="64" alt="{{lang "quick_topic.avatar_alt"}}" title="{{lang "quick_topic.avatar_tooltip"}}" />
+		<img class="little_row_avatar" src="{{.CurrentUser.MicroAvatar}}" height="64" alt="{{lang "quick_topic.avatar_alt"}}" title="{{lang "quick_topic.avatar_tooltip"}}" />
 		<input form="quick_post_form" id="topic_board_input" name="topic-board" value="{{.Forum.ID}}" type="hidden">
 		<div class="main_form">
 			<div class="topic_meta">
@@ -80,7 +80,7 @@
 		{{range .ItemList}}<div class="topic_row{{if .Sticky}} topic_sticky{{else if .IsClosed}} topic_closed{{end}}" data-tid="{{.ID}}">
 		<div class="rowitem topic_left passive datarow">
 			<span class="selector"></span>
-			<a href="{{.Creator.Link}}"><img src="{{.Creator.Avatar}}" height="64" alt="{{.Creator.Name}}'s Avatar" title="{{.Creator.Name}}'s Avatar" /></a>
+			<a href="{{.Creator.Link}}"><img src="{{.Creator.MicroAvatar}}" height="64" alt="{{.Creator.Name}}'s Avatar" title="{{.Creator.Name}}'s Avatar" /></a>
 			<span class="topic_inner_left">
 				<a class="rowtopic" href="{{.Link}}" itemprop="itemListElement" title="{{.Title}}"><span>{{.Title}}</span></a>
 				<br /><a class="rowsmall starter" href="{{.Creator.Link}}" title="{{.Creator.Name}}">{{.Creator.Name}}</a>
@@ -103,7 +103,7 @@
 		</div>
 		<div class="rowitem topic_right passive datarow">
 			<div class="topic_right_inside">
-				<a href="{{.LastUser.Link}}"><img src="{{.LastUser.Avatar}}" height="64" alt="{{.LastUser.Name}}'s Avatar" title="{{.LastUser.Name}}'s Avatar" /></a>
+				<a href="{{.LastUser.Link}}"><img src="{{.LastUser.MicroAvatar}}" height="64" alt="{{.LastUser.Name}}'s Avatar" title="{{.LastUser.Name}}'s Avatar" /></a>
 				<span>
 					<a href="{{.LastUser.Link}}" class="lastName" style="font-size: 14px;" title="{{.LastUser.Name}}">{{.LastUser.Name}}</a><br>
 					<span class="rowsmall lastReplyAt">{{.RelativeLastReplyAt}}</span>
diff --git a/templates/forums.html b/templates/forums.html
index f9fde264..54eb4503 100644
--- a/templates/forums.html
+++ b/templates/forums.html
@@ -16,7 +16,7 @@
 		{{end}}
 		</span>
 		<span class="forum_right shift_right">
-			{{if .LastReplyer.Avatar}}<img class="extra_little_row_avatar" src="{{.LastReplyer.Avatar}}" height=64 width=64 alt="{{.LastReplyer.Name}}'s Avatar" title="{{.LastReplyer.Name}}'s Avatar" />{{end}}
+			{{if .LastReplyer.MicroAvatar}}<img class="extra_little_row_avatar" src="{{.LastReplyer.MicroAvatar}}" height=64 width=64 alt="{{.LastReplyer.Name}}'s Avatar" title="{{.LastReplyer.Name}}'s Avatar" />{{end}}
 			<span>
 				<a {{if .LastTopic.Link}}href="{{.LastTopic.Link}}"{{else}}class="forum_no_poster"{{end}}>{{if .LastTopic.Title}}{{.LastTopic.Title}}{{else}}{{lang "forums_none"}}{{end}}</a>
 				{{if .LastTopicTime}}<br /><span class="rowsmall">{{.LastTopicTime}}</span>{{end}}
diff --git a/templates/header.html b/templates/header.html
index b7035596..c5c28880 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -42,7 +42,7 @@
 {{/** TODO: Make this a separate template and load it via the theme docks, here for now so we can rapidly prototype the Nox theme **/}}
 {{if eq .Header.Theme.Name "nox"}}
 <div class="user_box">
-	<img src="{{.CurrentUser.Avatar}}" />
+	<img src="{{.CurrentUser.MicroAvatar}}" />
 	<div class="option_box">
 		<a href="{{.CurrentUser.Link}}" class="username">{{.CurrentUser.Name}}</a>
 		<span class="alerts">{{lang "alerts_no_new_alerts"}}</span>
diff --git a/templates/profile_comments_row.html b/templates/profile_comments_row.html
index 7fbfe3d9..a7978039 100644
--- a/templates/profile_comments_row.html
+++ b/templates/profile_comments_row.html
@@ -21,7 +21,7 @@
 		<div class="rowitem passive deletable_block editable_parent comment {{.ClassName}}">
 			<div class="topRow">
 				<div class="userbit">
-					<img src="{{.Avatar}}" alt="{{.CreatedByName}}'s Avatar" title="{{.CreatedByName}}'s Avatar" />
+					<img src="{{.MicroAvatar}}" alt="{{.CreatedByName}}'s Avatar" title="{{.CreatedByName}}'s Avatar" />
 					<span class="nameAndTitle">
 						<a href="{{.UserLink}}" class="real_username username">{{.CreatedByName}}</a>
 						{{if .Tag}}<a class="username hide_on_mobile user_tag" style="float: right;">{{.Tag}}</a>{{end}}
diff --git a/templates/topics.html b/templates/topics.html
index a6cc1384..0be169d6 100644
--- a/templates/topics.html
+++ b/templates/topics.html
@@ -69,7 +69,7 @@
 <div class="rowblock topic_create_form quick_create_form" style="display: none;" aria-label="{{lang "quick_topic.aria"}}">
 	<form name="topic_create_form_form" id="quick_post_form" enctype="multipart/form-data" action="/topic/create/submit/?session={{.CurrentUser.Session}}" method="post"></form>
 	<input form="quick_post_form" id="has_poll_input" name="has_poll" value="0" type="hidden" />
-	<img class="little_row_avatar" src="{{.CurrentUser.Avatar}}" height="64" alt="{{lang "quick_topic.avatar_alt"}}" title="{{lang "quick_topic.avatar_tooltip"}}" />
+	<img class="little_row_avatar" src="{{.CurrentUser.MicroAvatar}}" height="64" alt="{{lang "quick_topic.avatar_alt"}}" title="{{lang "quick_topic.avatar_tooltip"}}" />
 	<div class="main_form">
 		<div class="topic_meta">
 			<div class="formrow topic_board_row real_first_child">
diff --git a/templates/topics_topic.html b/templates/topics_topic.html
index da1ca8ba..1cf3897d 100644
--- a/templates/topics_topic.html
+++ b/templates/topics_topic.html
@@ -1,7 +1,7 @@
 <div class="topic_row{{if .Sticky}} topic_sticky{{else if .IsClosed}} topic_closed{{end}}" data-tid="{{.ID}}">
 	<div class="rowitem topic_left passive datarow">
 		<span class="selector"></span>
-		<a href="{{.Creator.Link}}"><img src="{{.Creator.Avatar}}" height="64" alt="{{.Creator.Name}}'s Avatar" title="{{.Creator.Name}}'s Avatar" /></a>
+		<a href="{{.Creator.Link}}"><img src="{{.Creator.MicroAvatar}}" height="64" alt="{{.Creator.Name}}'s Avatar" title="{{.Creator.Name}}'s Avatar" /></a>
 		<span class="topic_inner_left">
 			<a class="rowtopic" href="{{.Link}}" itemprop="itemListElement" title="{{.Title}}"><span>{{.Title}}</span></a> {{if .ForumName}}<a class="rowsmall parent_forum" href="{{.ForumLink}}" title="{{.ForumName}}">{{.ForumName}}</a>{{end}}
 			<br /><a class="rowsmall starter" href="{{.Creator.Link}}" title="{{.Creator.Name}}">{{.Creator.Name}}</a>
@@ -24,7 +24,7 @@
 	</div>
 	<div class="rowitem topic_right passive datarow">
 		<div class="topic_right_inside">
-			<a href="{{.LastUser.Link}}"><img src="{{.LastUser.Avatar}}" height="64" alt="{{.LastUser.Name}}'s Avatar" title="{{.LastUser.Name}}'s Avatar" /></a>
+			<a href="{{.LastUser.Link}}"><img src="{{.LastUser.MicroAvatar}}" height="64" alt="{{.LastUser.Name}}'s Avatar" title="{{.LastUser.Name}}'s Avatar" /></a>
 			<span>
 				<a href="{{.LastUser.Link}}" class="lastName" style="font-size: 14px;" title="{{.LastUser.Name}}">{{.LastUser.Name}}</a><br>
 				<span class="rowsmall lastReplyAt">{{.RelativeLastReplyAt}}</span>