diff --git a/src/views/admin/partials/categories/select-category.tpl b/src/views/admin/partials/categories/select-category.tpl
index 643f561289..2c48f038f0 100644
--- a/src/views/admin/partials/categories/select-category.tpl
+++ b/src/views/admin/partials/categories/select-category.tpl
@@ -13,7 +13,16 @@
 				</li>
 				<!-- BEGIN categories -->
 				<li role="presentation" class="category {{{if categories.disabledClass}}}disabled{{{end}}}" data-cid="{categories.cid}" data-name="{categories.name}">
-					<a role="menuitem">{categories.level}<span component="category-markup"><!-- IF categories.icon --><span class="fa-stack" style="{function.generateCategoryBackground}"><i style="color: {categories.color};" class="fa fa-stack-1x fa-fw {categories.icon}"></i></span><!-- ENDIF categories.icon --> {categories.name}</span></a>
+					<a role="menuitem">{categories.level}
+						<span component="category-markup">
+							<div class="category-item d-inline-block">
+								<div role="presentation" class="icon pull-left" style="{function.generateCategoryBackground}">
+									<i class="fa fa-fw {./icon}"></i>
+								</div>
+								{./name}
+							</div>
+						</span>
+					</a>
 				</li>
 				<!-- END categories -->
 			</ul>
diff --git a/src/views/admin/partials/groups/privileges-select-category.tpl b/src/views/admin/partials/groups/privileges-select-category.tpl
index ee2dcf0ac8..2d83a508b8 100644
--- a/src/views/admin/partials/groups/privileges-select-category.tpl
+++ b/src/views/admin/partials/groups/privileges-select-category.tpl
@@ -11,7 +11,16 @@
 		</li>
 		{{{each categories}}}
 		<li role="presentation" class="category <!-- IF categories.disabledClass -->disabled<!-- ENDIF categories.disabledClass -->" data-cid="{categories.cid}" data-name="{categories.name}" data-parent-cid="{categories.parentCid}">
-			<a role="menuitem">{categories.level}<span component="category-markup"><!-- IF categories.icon --><span class="fa-stack" style="{function.generateCategoryBackground}"><i style="color: {categories.color};" class="fa fa-stack-1x fa-fw {categories.icon}"></i></span><!-- ENDIF categories.icon --> {categories.name}</span></a>
+			<a role="menuitem">{categories.level}
+				<span component="category-markup">
+					<div class="category-item d-inline-block">
+						<div role="presentation" class="icon pull-left" style="{function.generateCategoryBackground}">
+							<i class="fa fa-fw {./icon}"></i>
+						</div>
+						{./name}
+					</div>
+				</span>
+			</a>
 		</li>
 		{{{end}}}
 	</ul>