4 files changed, 21 insertions, 4 deletions
diff --git a/theme/admin/html/page/search.php b/theme/admin/html/page/search.php
index 145b0f9..240e512 100644
--- a/theme/admin/html/page/search.php
+++ b/theme/admin/html/page/search.php
@@ -3,8 +3,13 @@
 <p><?=$Language->text('search_page_desc')?></p>
 
 <form id="search-form" method="GET">
-	<div class="form-border-box background padding">
-		<input id="search-text" type="search" name="q" placeholder="<?=$Language->text('placeholder_search')?>" value="<?=escapeHTML($QUERY)?>" />
+	<div class="form-grid no-bottom-border">
+		<label for="form_query">
+			<i class="fa fa-search"></i><?=$Language->text('search')?></label>
+
+		<div class="form-grid-item first">
+			<input id="form_query" type="search" name="q" placeholder="<?=$Language->text('placeholder_search')?>" value="<?=escapeHTML($QUERY)?>" />
+		</div>
 	</div>
 	<div class="form-border-box background padding">
 		<input id="update-button" type="submit" value="<?=$Language->text('search')?>" />
diff --git a/theme/admin/html/post/search.php b/theme/admin/html/post/search.php
index 00bd016..835a4ef 100644
--- a/theme/admin/html/post/search.php
+++ b/theme/admin/html/post/search.php
@@ -3,8 +3,13 @@
 <p><?=$Language->text('search_post_desc')?></p>
 
 <form id="search-form" method="GET">
-	<div class="form-border-box background padding">
-		<input id="search-text" type="search" name="q" placeholder="<?=$Language->text('placeholder_search')?>" value="<?=escapeHTML($QUERY)?>" />
+	<div class="form-grid no-bottom-border">
+		<label for="form_query">
+			<i class="fa fa-search"></i><?=$Language->text('search')?></label>
+
+		<div class="form-grid-item first">
+			<input id="form_query" type="search" name="q" placeholder="<?=$Language->text('placeholder_search')?>" value="<?=escapeHTML($QUERY)?>" />
+		</div>
 	</div>
 	<div class="form-border-box background padding">
 		<input id="update-button" type="submit" value="<?=$Language->text('search')?>" />
diff --git a/theme/admin/rsrc/css/main.css b/theme/admin/rsrc/css/main.css
index 28a4c67..dd3a05e 100644
--- a/theme/admin/rsrc/css/main.css
+++ b/theme/admin/rsrc/css/main.css
@@ -518,6 +518,9 @@ table, td {
 .form-grid.two-columns {
   grid-template-columns: auto auto;
 }
+.form-grid.no-bottom-border {
+  border-bottom: none;
+}
 .form-grid > label {
   display: flex;
   align-items: center;
diff --git a/theme/admin/rsrc/css/main.scss b/theme/admin/rsrc/css/main.scss
index 0a64e07..c56792d 100644
--- a/theme/admin/rsrc/css/main.scss
+++ b/theme/admin/rsrc/css/main.scss
@@ -578,6 +578,10 @@ table, td {
 		grid-template-columns: auto auto;
 	}
 
+	&.no-bottom-border {
+		border-bottom: none;
+	}
+
 	> label {
 		display: flex;
 		align-items: center;