diff --git a/templates/base/components/global-search/layout.html.twig b/templates/base/components/global-search/layout.html.twig
index 347e7a5cd..8a3b3660e 100644
--- a/templates/base/components/global-search/layout.html.twig
+++ b/templates/base/components/global-search/layout.html.twig
@@ -1,6 +1,8 @@
 <div id="{{ oUIBlock.GetId() }}" class="ibo-global-search" data-role="ibo-global-search">
 	<form action="{{ oUIBlock.GetEndpoint() }}" method="post" class="ibo-global-search--head" data-role="ibo-global-search--head">
-		<a href="#" class="ibo-global-search--icon fas fa-search" data-role="ibo-global-search--icon" data-tooltip-content="{{ 'UI:Component:GlobalSearch:Tooltip'|dict_s }}" data-tooltip-placement="bottom-start" data-tooltip-distance-offset="25"></a>
+		<a href="#" class="ibo-global-search--icon" data-role="ibo-global-search--icon" data-tooltip-content="{{ 'UI:Component:GlobalSearch:Tooltip'|dict_s }}" data-tooltip-placement="bottom-start" data-tooltip-distance-offset="25">
+			<span class="fas fa-search"></span>
+		</a>
 		<input type="text" name="query" class="ibo-global-search--input" data-role="ibo-global-search--input" placeholder="{{ 'UI:Component:GlobalSearch:Input:Placeholder'|dict_s }}" autocomplete="off">
 	</form>
 	<div class="ibo-global-search--drawer" data-role="ibo-global-search--drawer">
diff --git a/templates/base/components/quick-create/layout.html.twig b/templates/base/components/quick-create/layout.html.twig
index 46d84485d..87270403c 100644
--- a/templates/base/components/quick-create/layout.html.twig
+++ b/templates/base/components/quick-create/layout.html.twig
@@ -1,8 +1,10 @@
 <div id="{{ oUIBlock.GetId() }}" class="ibo-quick-create" data-role="ibo-quick-create">
 	<form action="{{ oUIBlock.GetEndpoint() }}" method="get" class="ibo-quick-create--head" data-role="ibo-quick-create--head">
 		<input type="hidden" name="operation" value="new">
-		<a href="#" class="ibo-quick-create--icon fas fa-plus" data-role="ibo-quick-create--icon" data-tooltip-content="{{ 'UI:Component:QuickCreate:Tooltip'|dict_s }}"
-		   data-tooltip-placement="bottom-start" data-tooltip-distance-offset="25"></a>
+		<a href="#" class="ibo-quick-create--icon" data-role="ibo-quick-create--icon" data-tooltip-content="{{ 'UI:Component:QuickCreate:Tooltip'|dict_s }}"
+		   data-tooltip-placement="bottom-start" data-tooltip-distance-offset="25">
+			<span class="fas fa-plus"></span>
+		</a>
 		<select name="class" class="ibo-quick-create--input" data-role="ibo-quick-create--input">
 			<option value="">{{ 'UI:Component:QuickCreate:Input:Placeholder'|dict_s }}</option>
 			{% for sClassCode, sClassLabel in oUIBlock.GetAvailableClasses() %}