diff --git a/src/views/admin/manage/admins-mods.tpl b/src/views/admin/manage/admins-mods.tpl
index db609949a7..1556720d40 100644
--- a/src/views/admin/manage/admins-mods.tpl
+++ b/src/views/admin/manage/admins-mods.tpl
@@ -12,10 +12,12 @@
 		</div>
 		<div class="administrator-area">
 		{{{ each admins.members }}}
-			<div class="badge text-bg-light m-1 p-1" data-uid="{admins.members.uid}">
+			<div class="badge text-bg-light m-1 p-1 border d-inline-flex gap-1 align-items-center" data-uid="{admins.members.uid}">
 				{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>
+				<button class="btn-ghost-sm p-0 remove-user-icon">
+					<i class="fa fa-fw fa-times"></i>
+				</button>
 			</div>
 		{{{ end }}}
 		</div>
@@ -25,15 +27,17 @@
 
 	<div>
 		<div class="d-flex gap-2 justify-content-between align-items-center mb-2 flex-wrap">
-			<h4 class="mb-0">{{{ if globalMods.icon }}}<i class="fa {globalMods.icon}"></i> {{{ end }}}[[admin/manage/admins-mods:global-moderators]]</h4>
+			<h4 class="mb-0">[[admin/manage/admins-mods:global-moderators]]</h4>
 			<input id="global-mod-search" class="form-control form-control-sm w-auto" placeholder="[[admin/manage/admins-mods:add-global-moderator]]" />
 		</div>
 		<div class="global-moderator-area mb-2">
 		{{{ each globalMods.members }}}
-			<div class="badge text-bg-light  m-1 p-1" data-uid="{globalMods.members.uid}">
+			<div class="badge text-bg-light m-1 p-1 border d-inline-flex gap-1 align-items-center" data-uid="{globalMods.members.uid}">
 				{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>
+				<button class="btn-ghost-sm p-0 remove-user-icon">
+					<i class="fa fa-fw fa-times"></i>
+				</button>
 			</div>
 		{{{ end }}}
 		</div>
@@ -80,10 +84,12 @@
 
 			<div class="moderator-area" data-cid="{categoryMods.cid}">
 				{{{ each categoryMods.moderators }}}
-					<div class="badge text-bg-light m-1 p-1" data-uid="{categoryMods.moderators.uid}">
+					<div class="badge text-bg-light m-1 p-1 border d-inline-flex gap-1 align-items-center" data-uid="{categoryMods.moderators.uid}">
 						{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>
+						<button class="btn-ghost-sm p-0 remove-user-icon">
+							<i class="fa fa-fw fa-times" role="button"></i>
+						</button>
 					</div>
 				{{{ end }}}
 			</div>
diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl
index 655b326c3a..c771f75e94 100644
--- a/src/views/admin/manage/users.tpl
+++ b/src/views/admin/manage/users.tpl
@@ -38,9 +38,6 @@
 						</li>
 					</ul>
 				</div>
-			</div>
-
-			<div class="">
 				<div class="btn-group">
 					<button class="btn btn-primary btn-sm dropdown-toggle" id="action-dropdown" data-bs-toggle="dropdown" type="button" disabled="disabled">[[admin/manage/users:edit]] <span class="caret"></span></button>
 					<ul class="dropdown-menu dropdown-menu-end p-1">