diff --git a/patterns/hidden-404.php b/patterns/hidden-404.php
index e8be2673..f9ea93b5 100644
--- a/patterns/hidden-404.php
+++ b/patterns/hidden-404.php
@@ -35,7 +35,7 @@
 				<!-- wp:paragraph -->
 				<p><?php echo esc_html_x( 'The page you are looking for doesn\'t exist, or it has been moved. Please try searching using the form below.', '404 error message', 'twentytwentyfive' ); ?></p>
 				<!-- /wp:paragraph -->
-				<!-- wp:search {"label":"<?php esc_html_e( 'Search', 'twentytwentyfive' ); ?>","showLabel":false,"placeholder":"<?php echo esc_attr_x( 'Type something...', 'input placeholder text', 'twentytwentyfive' ); ?>","buttonText":"<?php echo esc_attr_x( 'Search', 'button label', 'twentytwentyfive' ); ?>","style":{"border":{"radius":"999px"}}} /-->
+				<!-- wp:pattern {"slug":"twentytwentyfive/hidden-search"} /-->
 			</div>
 			<!-- /wp:group -->
 		</div>
diff --git a/patterns/hidden-search.php b/patterns/hidden-search.php
index 0d95c216..e8c767ca 100644
--- a/patterns/hidden-search.php
+++ b/patterns/hidden-search.php
@@ -11,4 +11,4 @@
 
 ?>
 
-<!-- wp:search {"label":"<?php esc_html_e( 'Search', 'twentytwentyfive' ); ?>","showLabel":false,"buttonText":"<?php echo esc_attr_x( 'Search', 'button label', 'twentytwentyfive' ); ?>","style":{"border":{"radius":"50px"}},"fontSize":"medium","borderColor":"opacity-20"} /-->
\ No newline at end of file
+<!-- wp:search {"label":"<?php esc_html_e( 'Search', 'twentytwentyfive' ); ?>","showLabel":false,"placeholder":"<?php echo esc_attr_x( 'Type something...', 'input placeholder text', 'twentytwentyfive' ); ?>","buttonText":"<?php echo esc_attr_x( 'Search', 'button label', 'twentytwentyfive' ); ?>"} /-->
diff --git a/patterns/news-blog-search-results-template.php b/patterns/news-blog-search-results-template.php
index 1eb47392..e9fc4dc8 100644
--- a/patterns/news-blog-search-results-template.php
+++ b/patterns/news-blog-search-results-template.php
@@ -15,25 +15,33 @@
 <!-- wp:template-part {"slug":"header","area":"header"} /-->
 
 <!-- wp:group {"lock":{"move":false,"remove":false},"metadata":{"name":"Archive title and term description"},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
-<div class="wp-block-group alignwide"><!-- wp:spacer {"height":"var:preset|spacing|80"} -->
-<div style="height:var(--wp--preset--spacing--80)" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
+<div class="wp-block-group">
+	<!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
+	<div class="wp-block-group alignwide">
+		<!-- wp:spacer {"height":"var:preset|spacing|80"} -->
+		<div style="height:var(--wp--preset--spacing--80)" aria-hidden="true" class="wp-block-spacer"></div>
+		<!-- /wp:spacer -->
 
-<!-- wp:query-title {"type":"search"} /-->
+		<!-- wp:query-title {"type":"search"} /-->
 
-<!-- wp:search {"label":"Search","showLabel":false,"buttonText":"Search","style":{"border":{"radius":"50px"}},"fontSize":"medium","borderColor":"opacity-20"} /-->
+		<!-- wp:pattern {"slug":"twentytwentyfive/hidden-search"} /-->
 
-<!-- wp:spacer {"height":"var:preset|spacing|40"} -->
-<div style="height:var(--wp--preset--spacing--40)" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer --></div>
-<!-- /wp:group --></div>
+		<!-- wp:spacer {"height":"var:preset|spacing|40"} -->
+		<div style="height:var(--wp--preset--spacing--40)" aria-hidden="true" class="wp-block-spacer"></div>
+		<!-- /wp:spacer -->
+	</div>
+	<!-- /wp:group -->
+</div>
 <!-- /wp:group -->
 
 <!-- wp:group {"metadata":{"name":"Posts list"},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
-<div class="wp-block-group alignwide"><!-- wp:pattern {"slug":"twentytwentyfive/news-blog-query-loop"} /--></div>
-<!-- /wp:group --></div>
+<div class="wp-block-group">
+	<!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
+	<div class="wp-block-group alignwide">
+		<!-- wp:pattern {"slug":"twentytwentyfive/news-blog-query-loop"} /-->
+	</div>
+	<!-- /wp:group -->
+</div>
 <!-- /wp:group -->
 
 <!-- wp:template-part {"slug":"footer-newsletter","area":"footer"} /-->
diff --git a/patterns/photo-blog-search-results-template.php b/patterns/photo-blog-search-results-template.php
index 545d8e50..04b7027f 100644
--- a/patterns/photo-blog-search-results-template.php
+++ b/patterns/photo-blog-search-results-template.php
@@ -19,7 +19,7 @@
 	<!-- wp:query-title {"type":"search","textAlign":"center","align":"wide"} /-->
 	<!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
 	<div class="wp-block-group alignwide">
-		<!-- wp:search {"label":"Search","showLabel":false,"buttonText":"Search","align":"center","style":{"border":{"radius":"50px"}},"fontSize":"medium"} /-->
+		<!-- wp:pattern {"slug":"twentytwentyfive/hidden-search"} /-->
 	</div>
 	<!-- /wp:group -->
 	<!-- wp:pattern {"slug":"twentytwentyfive/photo-blog-posts"} /-->
diff --git a/patterns/text-only-blog-search-template.php b/patterns/text-only-blog-search-template.php
index 559d9776..d2a1ad7a 100644
--- a/patterns/text-only-blog-search-template.php
+++ b/patterns/text-only-blog-search-template.php
@@ -19,7 +19,7 @@
 	<!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
 	<div class="wp-block-group alignwide">
 		<!-- wp:query-title {"type":"search","align":"wide","fontSize":"x-large"} /-->
-		<!-- wp:search {"label":"Search","showLabel":false,"widthUnit":"%","buttonText":"Search","style":{"border":{"radius":"100px"}},"fontSize":"small","borderColor":"opacity-20"} /-->
+		<!-- wp:pattern {"slug":"twentytwentyfive/hidden-search"} /-->
 	</div>
 	<!-- /wp:group -->
 	<!-- wp:spacer {"height":"var:preset|spacing|50"} -->
diff --git a/patterns/vertical-header-right-aligned-search-results-template.php b/patterns/vertical-header-right-aligned-search-results-template.php
index e6378308..b86f0612 100644
--- a/patterns/vertical-header-right-aligned-search-results-template.php
+++ b/patterns/vertical-header-right-aligned-search-results-template.php
@@ -41,7 +41,7 @@
 			<div style="height:var(--wp--preset--spacing--50)" aria-hidden="true" class="wp-block-spacer"></div>
 			<!-- /wp:spacer -->
 			<!-- wp:query-title {"type":"search","fontSize":"large"} /-->
-			<!-- wp:search {"label":"Search","showLabel":false,"buttonText":"Search","style":{"border":{"radius":"50px"}},"fontSize":"small","borderColor":"opacity-20"} /-->
+			<!-- wp:pattern {"slug":"twentytwentyfive/hidden-search"} /-->
 			<!-- wp:spacer {"height":"var:preset|spacing|50"} -->
 			<div style="height:var(--wp--preset--spacing--50)" aria-hidden="true" class="wp-block-spacer"></div>
 			<!-- /wp:spacer -->
diff --git a/theme.json b/theme.json
index 8a703b64..c23d45c5 100644
--- a/theme.json
+++ b/theme.json
@@ -1277,7 +1277,7 @@
 				}
 			},
 			"core/search": {
-				"css": "& .wp-block-search__input{border-radius:3.125rem;padding-left:1.5625rem;padding-right:1.5625rem;}",
+				"css": "& .wp-block-search__input{border-radius:3.125rem;padding-left:1.5625rem;padding-right:1.5625rem;border-color:var(--wp--preset--color--opacity-20);}",
 				"typography": {
 					"fontSize": "var:preset|font-size|medium",
 					"lineHeight": "1.6"
@@ -1291,6 +1291,11 @@
 							"margin": {
 								"left": "1.125rem"
 							}
+						},
+						":hover" : {
+							"border": {
+								"color": "transparent"
+							}
 						}
 					}
 				}
@@ -1393,7 +1398,7 @@
 						"text": "var:preset|color|contrast"
 					},
 					"border": {
-						"color": "var:preset|color|accent-1"
+						"color": "currentColor"
 					}
 				},
 				"border": {