diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html
index b42b2d6c6f..7601b802de 100644
--- a/phpBB/adm/style/acp_avatar_options_upload.html
+++ b/phpBB/adm/style/acp_avatar_options_upload.html
@@ -17,52 +17,52 @@
 	<div class="avatar-cropper-buttons" id="avatar-cropper-buttons">
 		<div class="button-group">
 			<button class="button" type="button" title="{{ lang('ZOOM_IN') }}" data-cropper-action="zoom,0.1">
-				{{ Icon('font', 'search-plus', '', true, 'fas') }}
+				{{ Icon('font', 'search-plus', '', true) }}
 			</button>
 			<button class="button" type="button" title="{{ lang('ZOOM_OUT') }}" data-cropper-action="zoom,-0.1">
-				{{ Icon('font', 'search-minus', '', true, 'fas') }}
+				{{ Icon('font', 'search-minus', '', true) }}
 			</button>
 		</div>
 
 		<div class="button-group">
 			<button class="button" type="button" title="{{ lang('MOVE_LEFT') }}" data-cropper-action="move,-10,0">
-				{{ Icon('font', 'arrow-left', '', true, 'fas') }}
+				{{ Icon('font', 'arrow-left', '', true) }}
 			</button>
 			<button class="button" type="button" title="{{ lang('MOVE_RIGHT') }}" data-cropper-action="move,10,0">
-				{{ Icon('font', 'arrow-right', '', true, 'fas') }}
+				{{ Icon('font', 'arrow-right', '', true) }}
 			</button>
 			<button class="button" type="button" title="{{ lang('MOVE_UP') }}" data-cropper-action="move,0,-10">
-				{{ Icon('font', 'arrow-up', '', true, 'fas') }}
+				{{ Icon('font', 'arrow-up', '', true) }}
 			</button>
 			<button class="button" type="button" title="{{ lang('MOVE_DOWN') }}" data-cropper-action="move,0,10">
-				{{ Icon('font', 'arrow-down', '', true, 'fas') }}
+				{{ Icon('font', 'arrow-down', '', true) }}
 			</button>
 		</div>
 
 		<div class="button-group">
 			<button class="button" type="button" title="{{ lang('ROTATE_LEFT') }}" data-cropper-action="rotate,-90">
-				{{ Icon('font', 'rotate-left', '', true, 'fas') }}
+				{{ Icon('font', 'rotate-left', '', true) }}
 			</button>
 			<button class="button" type="button" title="{{ lang('ROTATE_RIGHT') }}" data-cropper-action="rotate,90">
-				{{ Icon('font', 'rotate-right', '', true, 'fas') }}
+				{{ Icon('font', 'rotate-right', '', true) }}
 			</button>
 		</div>
 
 		<div class="button-group">
 			<button class="button" type="button" title="{{ lang('FLIP_HORIZONTALLY') }}" data-cropper-action="scaleX">
-				{{ Icon('font', 'arrows-left-right', '', true, 'fas') }}
+				{{ Icon('font', 'arrows-left-right', '', true) }}
 			</button>
 			<button class="button" type="button" title="{{ lang('FLIP_VERTICALLY') }}" data-cropper-action="scaleY">
-				{{ Icon('font', 'arrows-up-down', '', true, 'fas') }}
+				{{ Icon('font', 'arrows-up-down', '', true) }}
 			</button>
 		</div>
 
 		<div class="button-group">
 			<button class="button" type="button" title="{{ lang('RESET') }}" data-cropper-action="reset">
-				{{ Icon('font', 'arrows-rotate', '', true, 'fas') }}
+				{{ Icon('font', 'arrows-rotate', '', true) }}
 			</button>
 			<button class="button" type="button" title="{{ lang('CLEAR') }}" data-cropper-action="clear">
-				{{ Icon('font', 'xmark', '', true, 'fas') }}
+				{{ Icon('font', 'xmark', '', true) }}
 			</button>
 		</div>
 	</div>
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 8ca1b5e32b..bb22ac861c 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -52,7 +52,7 @@
 			<td style="text-align: center;">
 				<!-- IF enabled.S_VERSIONCHECK -->
 				<strong class="<!-- IF enabled.S_UP_TO_DATE -->current-ext<!-- ELSE -->outdated-ext<!-- ENDIF -->">{enabled.META_VERSION}</strong>
-				<!-- IF not enabled.S_UP_TO_DATE -->{{ Icon('font', 'circle-exclamation', '', true, 'outdated-ext') }}<!-- ENDIF -->
+				<!-- IF not enabled.S_UP_TO_DATE -->{{ Icon('font', 'circle-exclamation', '', true, 'fas outdated-ext') }}<!-- ENDIF -->
 				<!-- ELSE -->
 				{enabled.META_VERSION}
 				<!-- ENDIF -->
@@ -78,7 +78,7 @@
 			<td style="text-align: center;">
 				<!-- IF disabled.S_VERSIONCHECK -->
 				<strong class="<!-- IF disabled.S_UP_TO_DATE -->current-ext<!-- ELSE -->outdated-ext<!-- ENDIF -->">{disabled.META_VERSION}</strong>
-				<!-- IF not disabled.S_UP_TO_DATE -->{{ Icon('font', 'circle-exclamation', '', true, 'outdated-ext') }}<!-- ENDIF -->
+				<!-- IF not disabled.S_UP_TO_DATE -->{{ Icon('font', 'circle-exclamation', '', true, 'fas outdated-ext') }}<!-- ENDIF -->
 				<!-- ELSE -->
 				{disabled.META_VERSION}
 				<!-- ENDIF -->
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index d4ccb09b38..4bf0091c6c 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1866,18 +1866,14 @@ input.button2:focus {
 	display: none;
 	width: 620px;
 	margin: 0 auto;
-	padding: 25px;
 	padding: 0 25px 20px;
 }
 
 .phpbb_alert .alert_close {
-	font-size: 16px;
-	text-decoration: none !important;
-	display: block;
+	font-size: 14px;
 	float: right;
-	overflow: hidden;
-	margin-top: -7px;
-	margin-right: -31px;
+	margin-top: 2px;
+	margin-right: -22px;
 }
 
 .phpbb_alert .alert_close:hover {