diff --git a/files/assets/css/main.css b/files/assets/css/main.css
index a2572c26d9..0e6cd9ca2f 100644
--- a/files/assets/css/main.css
+++ b/files/assets/css/main.css
@@ -7715,3 +7715,7 @@ thead {
 		max-width: 50%
 	}
 }
+
+input[type="search"]::-webkit-search-cancel-button {
+	display: none;
+}
diff --git a/files/templates/errors/WPD/404.html b/files/templates/errors/WPD/404.html
index 63be99590b..d5923fcbbf 100644
--- a/files/templates/errors/WPD/404.html
+++ b/files/templates/errors/WPD/404.html
@@ -108,7 +108,7 @@
 	<input autocomplete="off" class="form-control w-100" type="search" placeholder="Search" name="q" value="">
 	<span class="input-group-append">
 	<span class="input-group-text border-0 bg-transparent" style="margin-left: -2.5rem">
-	<i class="fa fa-search"></i>
+	<button type="submit" class="fa fa-search"></button>
 	</span>
 	</span>
 	<input hidden="" type="submit">
diff --git a/files/templates/errors/WPD/502.html b/files/templates/errors/WPD/502.html
index eff9c0c647..f6e14a95f9 100644
--- a/files/templates/errors/WPD/502.html
+++ b/files/templates/errors/WPD/502.html
@@ -108,7 +108,7 @@
 	<input autocomplete="off" class="form-control w-100" type="search" placeholder="Search" name="q" value="">
 	<span class="input-group-append">
 	<span class="input-group-text border-0 bg-transparent" style="margin-left: -2.5rem">
-	<i class="fa fa-search"></i>
+	<button type="submit" class="fa fa-search"></button>
 	</span>
 	</span>
 	<input hidden="" type="submit">
diff --git a/files/templates/errors/rDrama/404.html b/files/templates/errors/rDrama/404.html
index 12b3136e75..d902016aee 100644
--- a/files/templates/errors/rDrama/404.html
+++ b/files/templates/errors/rDrama/404.html
@@ -109,7 +109,7 @@
 	<input autocomplete="off" class="form-control w-100" type="search" placeholder="Search" name="q" value="">
 	<span class="input-group-append">
 	<span class="input-group-text border-0 bg-transparent" style="margin-left: -2.5rem">
-	<i class="fa fa-search"></i>
+	<button type="submit" class="fa fa-search"></button>
 	</span>
 	</span>
 	<input hidden="" type="submit">
diff --git a/files/templates/errors/rDrama/502.html b/files/templates/errors/rDrama/502.html
index 600e956f6b..266c0af17c 100644
--- a/files/templates/errors/rDrama/502.html
+++ b/files/templates/errors/rDrama/502.html
@@ -109,7 +109,7 @@
 	<input autocomplete="off" class="form-control w-100" type="search" placeholder="Search" name="q" value="">
 	<span class="input-group-append">
 	<span class="input-group-text border-0 bg-transparent" style="margin-left: -2.5rem">
-	<i class="fa fa-search"></i>
+	<button type="submit" class="fa fa-search"></button>
 	</span>
 	</span>
 	<input hidden="" type="submit">
diff --git a/files/templates/header.html b/files/templates/header.html
index d8c6fa305d..b2c32159e3 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -173,7 +173,7 @@
 						<input autocomplete="off" class="form-control w-100" type="search" placeholder="{{search_placeholder}}" name="q" value="{{request.values.get('q', '')}}">
 						<span class="input-group-append">
 							<span class="input-group-text border-0 bg-transparent" style="margin-left: -2.5rem">
-								<i class="fa fa-search"></i>
+								<button type="submit" class="fa fa-search"></button>
 							</span>
 						</span>
 						<input hidden type="submit">
@@ -398,8 +398,8 @@
 							<form id="searchform" class="form-inline search flex-nowrap mx-1 mx-lg-auto mb-0" action="/search/posts" method="get">
 								<input autocomplete="off" class="form-control form-control-sm w-100" type="search" placeholder="{{search_placeholder}}" name="q">
 								<span class="input-group-append">
-									<span class="input-group-text border-0 bg-transparent" style="margin-left: -2.5rem" data-nonce="{{g.nonce}}" onclick_submit>
-										<i class="fa fa-search"></i>
+									<span class="input-group-text border-0 bg-transparent" style="margin-left: -2.5rem">
+										<button type="submit" class="fa fa-search"></button>
 									</span>
 								</span>
 							</form>
diff --git a/files/templates/home.html b/files/templates/home.html
index a5fb5cc709..eae4381cbf 100644
--- a/files/templates/home.html
+++ b/files/templates/home.html
@@ -54,8 +54,8 @@
 			<form id="searchform" class="form-inline d-md-none search flex-nowrap mt-2" action="/search/posts" method="get">
 				<input autocomplete="off" class="form-control form-control-sm w-100" type="search" placeholder="{{search_placeholder}}" name="q">
 				<span class="input-group-append">
-					<span class="input-group-text border-0 bg-transparent" style="margin-left: -2.5rem" data-nonce="{{g.nonce}}" onclick_submit>
-						<i class="fa fa-search"></i>
+					<span class="input-group-text border-0 bg-transparent" style="margin-left: -2.5rem">
+						<button type="submit" class="fa fa-search"></button>
 					</span>
 				</span>
 			</form>
diff --git a/files/templates/search.html b/files/templates/search.html
index 2e4cd0efec..f0c9af1e2a 100644
--- a/files/templates/search.html
+++ b/files/templates/search.html
@@ -10,7 +10,7 @@
 		<input autocomplete="off" class="form-control w-100" type="search" placeholder="Search" name="q" value="{{query}}">
 		<span class="input-group-append">
 			<span class="input-group-text border-0 bg-transparent" style="margin-left: -2.5rem">
-				<i class="fa fa-search"></i>
+				<button type="submit" class="fa fa-search"></button>
 			</span>
 		</span>
 		<input hidden type="submit">