diff --git a/packages/block-library/src/reset.scss b/packages/block-library/src/reset.scss
index 3bc1ccd373703a..be7232ebd0e483 100644
--- a/packages/block-library/src/reset.scss
+++ b/packages/block-library/src/reset.scss
@@ -104,7 +104,18 @@
 	textarea,
 	button {
 		font-family: system-ui;
-		all: revert;
+		font-size: revert;
+		font-weight: revert;
+		border-radius: revert;
+		border: revert;
+		background: revert;
+		color: revert;
+		padding: revert;
+		margin: revert;
+		line-height: revert;
+		min-height: revert;
+		box-shadow: revert;
+		box-sizing: revert;
 	}
 
 	// For these I prefer to only override the WP-Admin defined styles and not "all"
@@ -132,6 +143,7 @@
 			border: revert;
 			box-shadow: revert;
 			outline: revert;
+			padding: revert;
 		}
 	}
 }
diff --git a/packages/block-library/src/search/edit.js b/packages/block-library/src/search/edit.js
index b66cbd8be5d8b8..57b71031bfc326 100644
--- a/packages/block-library/src/search/edit.js
+++ b/packages/block-library/src/search/edit.js
@@ -149,21 +149,19 @@ export default function SearchEdit( {
 				) }
 
 				{ ! buttonUseIcon && (
-					// This rule only makes sense for UI not blocks.
-					// eslint-disable-next-line react/forbid-elements
-					<button type="submit" className="wp-block-search__button">
-						<RichText
-							tagName="span"
-							style={ { display: 'inline-block' } }
-							aria-label={ __( 'Button text' ) }
-							placeholder={ __( 'Add button text…' ) }
-							withoutInteractiveFormatting
-							value={ buttonText }
-							onChange={ ( html ) =>
-								setAttributes( { buttonText: html } )
-							}
-						/>
-					</button>
+					<RichText
+						type="submit"
+						className="wp-block-search__button"
+						tagName="button"
+						style={ { display: 'inline-block' } }
+						aria-label={ __( 'Button text' ) }
+						placeholder={ __( 'Add button text…' ) }
+						withoutInteractiveFormatting
+						value={ buttonText }
+						onChange={ ( html ) =>
+							setAttributes( { buttonText: html } )
+						}
+					/>
 				) }
 			</>
 		);
diff --git a/packages/block-library/src/search/style.scss b/packages/block-library/src/search/style.scss
index b66519a49b715d..6f47aa3761dbcb 100644
--- a/packages/block-library/src/search/style.scss
+++ b/packages/block-library/src/search/style.scss
@@ -29,7 +29,7 @@
 		width: 100%;
 	}
 
-	.wp-block-search__input[type="search"] {
+	.wp-block-search__input {
 		flex-grow: 1;
 		min-width: 3em;
 		border: 1px solid $gray-600;