diff --git a/public/src/modules/helpers.common.js b/public/src/modules/helpers.common.js
index 7381182f40..1e2d662990 100644
--- a/public/src/modules/helpers.common.js
+++ b/public/src/modules/helpers.common.js
@@ -207,7 +207,7 @@ module.exports = function (utils, Benchpress, relative_path) {
 
 			if (event.user) {
 				if (!event.user.system) {
-					html += `<span><a href="${relative_path}/user/${event.user.userslug}">${buildAvatar(event.user, 'xs', true)}&nbsp;${event.user.username}</a></span>&nbsp;`;
+					html += `<span><a href="${relative_path}/user/${event.user.userslug}">${buildAvatar(event.user, '16px', true)}&nbsp;${event.user.username}</a></span>&nbsp;`;
 				} else {
 					html += `<span class="timeline-text">[[global:system-user]]</span>&nbsp;`;
 				}
diff --git a/src/user/approval.js b/src/user/approval.js
index 24e84fba64..9f2aeca562 100644
--- a/src/user/approval.js
+++ b/src/user/approval.js
@@ -132,7 +132,7 @@ module.exports = function (User) {
 			// need to keep this for getIPMatchedUsers
 			user.ip = user.ip.replace('::ffff:', '');
 			await getIPMatchedUsers(user);
-			user.customActions = [].concat(user.customActions);
+			user.customActions = user.customActions || [];
 			/*
 				// then spam prevention plugins, using the "filter:user.getRegistrationQueue" hook can be like:
 				user.customActions.push({
diff --git a/src/views/admin/advanced/events.tpl b/src/views/admin/advanced/events.tpl
index 5e3403c158..2fab55dbba 100644
--- a/src/views/admin/advanced/events.tpl
+++ b/src/views/admin/advanced/events.tpl
@@ -14,13 +14,7 @@
 							<span class="badge bg-info">{events.type}</span>
 							<span class="badge bg-info">uid {events.uid}</span>
 							<!-- IF events.ip --><span class="badge bg-info">{events.ip}</span><!-- END -->
-							<a href="{config.relative_path}/user/{events.user.userslug}" target="_blank">
-								<!-- IF events.user.picture -->
-								<img class="avatar avatar-xs" src="{events.user.picture}" alt="" />
-								<!-- ELSE -->
-								<div class="avatar avatar-xs" style="background-color: {events.user.icon:bgColor};">{events.user.icon:text}</div>
-								<!-- ENDIF events.user.picture -->
-							</a>
+							<a href="{config.relative_path}/user/{events.user.userslug}" target="_blank">{buildAvatar(events.user, "24px", true)}</a>
 							<a href="{config.relative_path}/user/{events.user.userslug}" target="_blank">{events.user.username}</a>
 							<span class="float-end delete-event ms-2 pointer"><i class="fa fa-trash-o"></i></span>
 							<span class="float-end">{events.timestampISO}</span>
diff --git a/src/views/admin/manage/admins-mods.tpl b/src/views/admin/manage/admins-mods.tpl
index 1ee0b3e320..4eeade08d3 100644
--- a/src/views/admin/manage/admins-mods.tpl
+++ b/src/views/admin/manage/admins-mods.tpl
@@ -4,11 +4,7 @@
 		<div class="administrator-area">
 		<!-- BEGIN admins.members -->
 			<div class="badge text-bg-light m-1 p-1 float-start" data-uid="{admins.members.uid}">
-				<!-- IF admins.members.picture -->
-				<img class="avatar avatar-sm" src="{admins.members.picture}" alt="" />
-				<!-- ELSE -->
-				<div class="avatar avatar-sm" style="background-color: {admins.members.icon:bgColor};">{admins.members.icon:text}</div>
-				<!-- ENDIF admins.members.picture -->
+				{buildAvatar(admins.members, "24px", true)}
 				<a href="{config.relative_path}/user/{admins.members.userslug}">{admins.members.username}</a>
 				<i class="mx-1 remove-user-icon fa fa-times" role="button"></i>
 			</div>
@@ -22,11 +18,7 @@
 		<div class="global-moderator-area">
 		<!-- BEGIN globalMods.members -->
 			<div class="badge text-bg-light  m-1 p-1 float-start" data-uid="{globalMods.members.uid}">
-				<!-- IF globalMods.members.picture -->
-				<img class="avatar avatar-sm" src="{globalMods.members.picture}" alt="" />
-				<!-- ELSE -->
-				<div class="avatar avatar-sm" style="background-color: {globalMods.members.icon:bgColor};">{globalMods.members.icon:text}</div>
-				<!-- ENDIF globalMods.members.picture -->
+				{buildAvatar(globalMods.members, "24px", true)}
 				<a href="{config.relative_path}/user/{globalMods.members.userslug}">{globalMods.members.username}</a>
 				<i class="mx-1 remove-user-icon fa fa-times" role="button"></i>
 			</div>
@@ -55,11 +47,7 @@
 			<div class="moderator-area" data-cid="{categoryMods.cid}">
 				{{{ each categoryMods.moderators }}}
 					<div class="badge text-bg-light m-1 p-1 float-start" data-uid="{categoryMods.moderators.uid}">
-						{{{ if  categoryMods.moderators.picture }}}
-						<img class="avatar avatar-sm" src="{categoryMods.moderators.picture}" alt="" />
-						{{{ else }}}
-						<div class="avatar avatar-sm" style="background-color: {categoryMods.moderators.icon:bgColor};">{categoryMods.moderators.icon:text}</div>
-						{{{ end }}}
+						{buildAvatar(categoryMods.moderators, "24px", true)}
 						<a href="{config.relative_path}/user/{categoryMods.moderators.userslug}">{categoryMods.moderators.username}</a>
 						<i class="mx-1 remove-user-icon fa fa-times" role="button"></i>
 					</div>
diff --git a/src/views/admin/manage/digest.tpl b/src/views/admin/manage/digest.tpl
index e35926acb3..4389195f5f 100644
--- a/src/views/admin/manage/digest.tpl
+++ b/src/views/admin/manage/digest.tpl
@@ -15,7 +15,7 @@
 		<tbody>
 			<!-- BEGIN delivery -->
 			<tr>
-				<td><a href="{config.relative_path}/uid/{../uid}">{buildAvatar(delivery, "sm", true)} {../username}</a></td>
+				<td>{buildAvatar(delivery, "24px", true)} <a href="{config.relative_path}/uid/{../uid}">{../username}</a></td>
 				<td>{{{if ../setting}}}{../setting}{{{else}}}<em>[[admin/manage/digest:default]]</em>{{{end}}}</td>
 				<td>{../lastDelivery}</td>
 				<td><button class="btn btn-sm btn-outline-secondary" data-action="resend" data-uid="{../uid}">[[admin/manage/digest:resend]]</button></td>
diff --git a/src/views/admin/manage/registration.tpl b/src/views/admin/manage/registration.tpl
index 5e25c60938..e4005335f4 100644
--- a/src/views/admin/manage/registration.tpl
+++ b/src/views/admin/manage/registration.tpl
@@ -57,11 +57,7 @@
 								{users.ip}
 								{{{ each users.ipMatch }}}
 								<br>
-								<!-- IF users.ipMatch.picture -->
-								<img src="{users.ipMatch.picture}" class="user-img" alt="" />
-								<!-- ELSE -->
-								<div class="user-img avatar avatar-sm" style="background-color: {users.ipMatch.icon:bgColor};">{users.ipMatch.icon:text}</div>
-								<!-- ENDIF users.ipMatch.picture -->
+								{buildAvatar(users.ipMatch, "24px", true)}
 								<a href="{config.relative_path}/uid/{users.ipMatch.uid}">{users.ipMatch.username}</a>
 								{{{ end }}}
 							</td>
diff --git a/src/views/admin/partials/groups/memberlist.tpl b/src/views/admin/partials/groups/memberlist.tpl
index 2ec3e658d9..d92eaf05ab 100644
--- a/src/views/admin/partials/groups/memberlist.tpl
+++ b/src/views/admin/partials/groups/memberlist.tpl
@@ -17,13 +17,7 @@
 	<!-- BEGIN group.members -->
 	<tr data-uid="{group.members.uid}">
 		<td>
-			<a href="{config.relative_path}/user/{group.members.userslug}">
-				<!-- IF group.members.picture -->
-				<img class="avatar avatar-sm avatar-rounded" src="{group.members.picture}" alt="" />
-				<!-- ELSE -->
-				<div class="avatar avatar-sm avatar-rounded" style="background-color: {group.members.icon:bgColor};">{group.members.icon:text}</div>
-				<!-- ENDIF group.members.picture -->
-			</a>
+			<a href="{config.relative_path}/user/{group.members.userslug}">{buildAvatar(group.members, "24px", true)}</a>
 		</td>
 		<td class="member-name">
 			<a href="{config.relative_path}/user/{group.members.userslug}">{group.members.username}</a> <i title="[[groups:owner]]" class="user-owner-icon fa fa-star text-warning <!-- IF !group.members.isOwner -->invisible<!-- ENDIF !group.members.isOwner -->"></i>