diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 4bf0091c6c..290eaffcf8 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -3007,12 +3007,6 @@ fieldset.permissions .permissions-switch {
 	padding-right: 0.3em;
 }
 
-/* this class loads Free and Brand icons, for use when .fas and .fab are needed at same time */
-.icon {
-	font-family: "Font Awesome 6 Free", "Font Awesome 6 Brands";
-	font-style: normal;
-}
-
 .send-stats-data-row {
 	background: #f9f9f9;
 	border: #dedede 1px solid;
@@ -3106,6 +3100,28 @@ fieldset.permissions .permissions-switch {
 	overflow-x: scroll;
 }
 
+.o-icon {
+	vertical-align: middle !important;
+}
+
+.o-icon-font {
+	font-family: "Font Awesome 6 Free", "Font Awesome 6 Brands";
+	font-style: normal;
+	font-variant: normal;
+	-webkit-font-smoothing: antialiased;
+	vertical-align: baseline;
+	display: inline-block;
+	/* stylelint-disable order/properties-order */
+	-moz-osx-font-smoothing: grayscale;
+	/* stylelint-enable order/properties-order */
+	text-rendering: auto; /* optimizelegibility throws things off #1094 */
+}
+
+.o-icon + span,
+span + .o-icon {
+	padding-left: 4px;
+}
+
 .acp-icon {
 	font-size: 1.5em;
 }