diff --git a/assets/css/abstracts/_mixins.scss b/assets/css/abstracts/_mixins.scss
index 09c8e597520..10bc29f86bc 100644
--- a/assets/css/abstracts/_mixins.scss
+++ b/assets/css/abstracts/_mixins.scss
@@ -123,8 +123,11 @@ $fontSizes: (
 	vertical-align: baseline;
 }
 
-@mixin reset-typography() {
+@mixin reset-color() {
 	color: inherit;
+}
+
+@mixin reset-typography() {
 	font-family: inherit;
 	font-size: inherit;
 	font-style: inherit;
@@ -138,6 +141,7 @@ $fontSizes: (
 // Reset <h1>, <h2>, etc. styles as if they were text. Useful for elements that must be headings for a11y but don't need those styles.
 @mixin text-heading() {
 	@include reset-box();
+	@include reset-color();
 	@include reset-typography();
 	box-shadow: none;
 	display: inline;
@@ -148,6 +152,7 @@ $fontSizes: (
 // Reset <button> style as if it was text. Useful for elements that must be `<button>` for a11y but don't need those styles.
 @mixin text-button() {
 	@include reset-box();
+	@include reset-color();
 	@include reset-typography();
 	background: transparent;
 	box-shadow: none;
diff --git a/assets/js/atomic/blocks/product-elements/button/style.scss b/assets/js/atomic/blocks/product-elements/button/style.scss
index f2e2552316a..e0b95ed385e 100644
--- a/assets/js/atomic/blocks/product-elements/button/style.scss
+++ b/assets/js/atomic/blocks/product-elements/button/style.scss
@@ -5,8 +5,6 @@
 	.wc-block-components-product-button__button {
 		border-style: none;
 		display: inline-flex;
-		font-family: inherit;
-		font-weight: inherit;
 		justify-content: center;
 		margin-right: auto;
 		margin-left: auto;
diff --git a/assets/js/base/components/button/style.scss b/assets/js/base/components/button/style.scss
index 4b0ea7771af..351b2bd15f3 100644
--- a/assets/js/base/components/button/style.scss
+++ b/assets/js/base/components/button/style.scss
@@ -2,6 +2,7 @@
 	align-items: center;
 	display: inline-flex;
 	min-height: 3em;
+	height: auto;
 	justify-content: center;
 	text-align: center;
 	position: relative;
@@ -57,12 +58,7 @@
 }
 
 body:not(.woocommerce-block-theme-has-button-styles) .wc-block-components-button:not(.is-link) {
-	@include reset-typography();
-	font-weight: bold;
-	line-height: 1;
 	padding: 0 em($gap);
-	text-decoration: none;
-	text-transform: none;
 
 	&:focus {
 		box-shadow: 0 0 0 2px $studio-blue;
@@ -77,21 +73,4 @@ body:not(.woocommerce-block-theme-has-button-styles) .wc-block-components-button
 			opacity: 0.9;
 		}
 	}
-
-	&.contained {
-		background-color: $gray-900;
-		color: $white;
-
-		&:disabled,
-		&:hover,
-		&:focus,
-		&:active {
-			background-color: $gray-900;
-			color: $white;
-		}
-
-		&:hover {
-			opacity: 0.9;
-		}
-	}
 }
diff --git a/assets/js/base/components/cart-checkout/form-step/style.scss b/assets/js/base/components/cart-checkout/form-step/style.scss
index 9562a0e5b71..5f3d1c40ea8 100644
--- a/assets/js/base/components/cart-checkout/form-step/style.scss
+++ b/assets/js/base/components/cart-checkout/form-step/style.scss
@@ -21,6 +21,11 @@
 
 .wc-block-components-checkout-step__container {
 	position: relative;
+
+	textarea {
+		font-style: inherit;
+		font-weight: inherit;
+	}
 }
 
 .wc-block-components-checkout-step__content > * {
@@ -32,14 +37,8 @@
 }
 
 .wc-block-components-checkout-step__heading {
-	display: flex;
-	justify-content: space-between;
-	align-content: center;
-	flex-wrap: wrap;
 	margin: em($gap-small) 0 em($gap);
 	position: relative;
-	align-items: center;
-	gap: em($gap);
 
 	.wc-block-components-express-payment-continue-rule + .wc-block-components-checkout-step & {
 		margin-top: 0;
diff --git a/assets/js/base/components/cart-checkout/order-summary/index.tsx b/assets/js/base/components/cart-checkout/order-summary/index.tsx
index 435bf0adc14..92ed94c4271 100644
--- a/assets/js/base/components/cart-checkout/order-summary/index.tsx
+++ b/assets/js/base/components/cart-checkout/order-summary/index.tsx
@@ -35,7 +35,6 @@ const OrderSummary = ( {
 					{ __( 'Order summary', 'woo-gutenberg-products-block' ) }
 				</span>
 			}
-			titleTag="h2"
 		>
 			<div className="wc-block-components-order-summary__content">
 				{ cartItems.map( ( cartItem ) => {
diff --git a/assets/js/base/components/cart-checkout/order-summary/style.scss b/assets/js/base/components/cart-checkout/order-summary/style.scss
index 739e0998036..d03c8a33c36 100644
--- a/assets/js/base/components/cart-checkout/order-summary/style.scss
+++ b/assets/js/base/components/cart-checkout/order-summary/style.scss
@@ -8,97 +8,97 @@
 	.wc-block-components-panel__content {
 		margin-bottom: 0;
 	}
-}
 
-.wc-block-components-order-summary__content {
-	display: table;
-	width: 100%;
-}
+	.wc-block-components-order-summary__content {
+		display: table;
+		width: 100%;
+	}
 
-.wc-block-components-order-summary-item {
-	@include with-translucent-border(0 0 1px);
-	@include font-size(small);
-	display: flex;
-	padding-bottom: 1px;
-	padding-top: $gap;
-	width: 100%;
+	.wc-block-components-order-summary-item {
+		@include with-translucent-border(0 0 1px);
+		@include font-size(small);
+		display: flex;
+		padding-bottom: 1px;
+		padding-top: $gap;
+		width: 100%;
 
-	&:first-child {
-		padding-top: 0;
-	}
+		&:first-child {
+			padding-top: 0;
+		}
 
-	&:last-child {
-		> div {
-			padding-bottom: 0;
+		&:last-child {
+			> div {
+				padding-bottom: 0;
+			}
+
+			&::after {
+				display: none;
+			}
 		}
 
-		&::after {
-			display: none;
+		.wc-block-components-product-metadata {
+			@include font-size(regular);
 		}
 	}
 
-	.wc-block-components-product-metadata {
-		@include font-size(regular);
+	.wc-block-components-order-summary-item__image,
+	.wc-block-components-order-summary-item__description {
+		display: table-cell;
+		vertical-align: top;
 	}
-}
-
-.wc-block-components-order-summary-item__image,
-.wc-block-components-order-summary-item__description {
-	display: table-cell;
-	vertical-align: top;
-}
-
-.wc-block-components-order-summary-item__image {
-	width: #{$gap-large * 2};
-	padding-bottom: $gap;
-	position: relative;
 
-	> img {
+	.wc-block-components-order-summary-item__image {
 		width: #{$gap-large * 2};
-		max-width: #{$gap-large * 2};
+		padding-bottom: $gap;
+		position: relative;
+
+		> img {
+			width: #{$gap-large * 2};
+			max-width: #{$gap-large * 2};
+		}
 	}
-}
 
-.wc-block-components-order-summary-item__quantity {
-	align-items: center;
-	background: #fff;
-	border: 2px solid;
-	border-radius: 1em;
-	box-shadow: 0 0 0 2px #fff;
-	color: #000;
-	display: flex;
-	line-height: 1;
-	min-height: 20px;
-	padding: 0 0.4em;
-	position: absolute;
-	justify-content: center;
-	min-width: 20px;
-	right: 0;
-	top: 0;
-	transform: translate(50%, -50%);
-	white-space: nowrap;
-	z-index: 1;
-}
+	.wc-block-components-order-summary-item__quantity {
+		align-items: center;
+		background: #fff;
+		border: 2px solid;
+		border-radius: 1em;
+		box-shadow: 0 0 0 2px #fff;
+		color: #000;
+		display: flex;
+		line-height: 1;
+		min-height: 20px;
+		padding: 0 0.4em;
+		position: absolute;
+		justify-content: center;
+		min-width: 20px;
+		right: 0;
+		top: 0;
+		transform: translate(50%, -50%);
+		white-space: nowrap;
+		z-index: 1;
+	}
 
-.wc-block-components-order-summary-item__description {
-	padding-left: $gap-large;
-	padding-right: $gap-small;
-	padding-bottom: $gap;
+	.wc-block-components-order-summary-item__description {
+		padding-left: $gap-large;
+		padding-right: $gap-small;
+		padding-bottom: $gap;
 
-	p,
-	.wc-block-components-product-metadata {
-		line-height: 1.375;
-		margin-top: #{ ($gap-large - $gap) * 0.5 };
+		p,
+		.wc-block-components-product-metadata {
+			line-height: 1.375;
+			margin-top: #{ ($gap-large - $gap) * 0.5 };
+		}
 	}
-}
 
-.wc-block-components-order-summary-item__total-price {
-	font-weight: bold;
-	margin-left: auto;
-	text-align: right;
-}
+	.wc-block-components-order-summary-item__total-price {
+		font-weight: bold;
+		margin-left: auto;
+		text-align: right;
+	}
 
 
-.wc-block-components-order-summary-item__individual-prices {
-	display: block;
+	.wc-block-components-order-summary-item__individual-prices {
+		display: block;
+	}
 }
diff --git a/assets/js/base/components/cart-checkout/product-image/index.tsx b/assets/js/base/components/cart-checkout/product-image/index.tsx
index f3a0fc38574..f904a7e2f50 100644
--- a/assets/js/base/components/cart-checkout/product-image/index.tsx
+++ b/assets/js/base/components/cart-checkout/product-image/index.tsx
@@ -4,11 +4,6 @@
 import { decodeEntities } from '@wordpress/html-entities';
 import { PLACEHOLDER_IMG_SRC } from '@woocommerce/settings';
 
-/**
- * Internal dependencies
- */
-import './style.scss';
-
 interface ProductImageProps {
 	image: { alt?: string; thumbnail?: string };
 	fallbackAlt: string;
@@ -37,13 +32,7 @@ const ProductImage = ( {
 				alt: '',
 		  };
 
-	return (
-		<img
-			className="wc-block-components-product-image"
-			{ ...imageProps }
-			alt={ imageProps.alt }
-		/>
-	);
+	return <img { ...imageProps } alt={ imageProps.alt } />;
 };
 
 export default ProductImage;
diff --git a/assets/js/base/components/cart-checkout/product-image/style.scss b/assets/js/base/components/cart-checkout/product-image/style.scss
deleted file mode 100644
index 425250caf56..00000000000
--- a/assets/js/base/components/cart-checkout/product-image/style.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-img.wc-block-components-product-image[alt=""] {
-	border: 1px solid $image-placeholder-border-color;
-}
diff --git a/assets/js/base/components/radio-control/style.scss b/assets/js/base/components/radio-control/style.scss
index deedaf8cf93..223220faf46 100644
--- a/assets/js/base/components/radio-control/style.scss
+++ b/assets/js/base/components/radio-control/style.scss
@@ -1,4 +1,5 @@
 .wc-block-components-radio-control__option {
+	@include reset-color();
 	@include reset-typography();
 	display: block;
 	margin: em($gap) 0;
diff --git a/assets/js/base/components/sidebar-layout/style.scss b/assets/js/base/components/sidebar-layout/style.scss
index 617f2d743a2..6c30e710474 100644
--- a/assets/js/base/components/sidebar-layout/style.scss
+++ b/assets/js/base/components/sidebar-layout/style.scss
@@ -49,11 +49,14 @@
 .is-large {
 	.wc-block-components-sidebar {
 		.wc-block-components-totals-item,
-		.wc-block-components-totals-coupon-link,
 		.wc-block-components-panel {
 			padding-left: $gap;
 			padding-right: $gap;
 		}
+		.wc-block-components-totals-coupon-link {
+			margin-left: $gap;
+			margin-right: $gap;
+		}
 
 		.wc-block-components-panel {
 			.wc-block-components-totals-item {
diff --git a/assets/js/base/components/title/style.scss b/assets/js/base/components/title/style.scss
index d974d87539b..4da502fa1da 100644
--- a/assets/js/base/components/title/style.scss
+++ b/assets/js/base/components/title/style.scss
@@ -3,6 +3,13 @@
 	@include reset-box();
 	@include font-size(large);
 	word-break: break-word;
+
+	textarea {
+		letter-spacing: inherit;
+		text-transform: inherit;
+		font-weight: inherit;
+		font-style: inherit;
+	}
 }
 
 // For Twenty Twenty we need to increase specificity a bit more.
diff --git a/assets/js/blocks/cart-checkout-shared/payment-methods/style.scss b/assets/js/blocks/cart-checkout-shared/payment-methods/style.scss
index 584d5861943..f17411e9cb5 100644
--- a/assets/js/blocks/cart-checkout-shared/payment-methods/style.scss
+++ b/assets/js/blocks/cart-checkout-shared/payment-methods/style.scss
@@ -59,6 +59,7 @@
 	}
 
 	label {
+		@include reset-color();
 		@include reset-typography();
 		@include font-size(regular);
 		line-height: 1.375; // =22px when font-size is 16px.
diff --git a/assets/js/blocks/cart/cart-cross-sells-product-list/cart-cross-sells-product.tsx b/assets/js/blocks/cart/cart-cross-sells-product-list/cart-cross-sells-product.tsx
index c883d0db66d..e35f7c6576e 100644
--- a/assets/js/blocks/cart/cart-cross-sells-product-list/cart-cross-sells-product.tsx
+++ b/assets/js/blocks/cart/cart-cross-sells-product-list/cart-cross-sells-product.tsx
@@ -16,7 +16,6 @@ import { Block as ProductRating } from '../../../atomic/blocks/product-elements/
 import { Block as ProductSaleBadge } from '../../../atomic/blocks/product-elements/sale-badge/block';
 import { Block as ProductPrice } from '../../../atomic/blocks/product-elements/price/block';
 import { Block as ProductButton } from '../../../atomic/blocks/product-elements/button/block';
-import AddToCartButton from '../../../atomic/blocks/product-elements/add-to-cart/block';
 import { ImageSizing } from '../../../atomic/blocks/product-elements/image/types';
 
 interface CrossSellsProductProps {
@@ -60,11 +59,7 @@ const CartCrossSellsProduct = ( {
 						/>
 						<ProductPrice />
 					</div>
-					{ product.is_in_stock ? (
-						<AddToCartButton />
-					) : (
-						<ProductButton />
-					) }
+					<ProductButton />
 				</ProductDataContextProvider>
 			</InnerBlockLayoutContextProvider>
 		</div>
diff --git a/assets/js/blocks/cart/inner-blocks/cart-order-summary-heading/block.tsx b/assets/js/blocks/cart/inner-blocks/cart-order-summary-heading/block.tsx
index 015c29f8f97..9e8d95928c5 100644
--- a/assets/js/blocks/cart/inner-blocks/cart-order-summary-heading/block.tsx
+++ b/assets/js/blocks/cart/inner-blocks/cart-order-summary-heading/block.tsx
@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-import Title from '@woocommerce/base-components/title';
 import classnames from 'classnames';
 
 const Block = ( {
@@ -12,12 +11,11 @@ const Block = ( {
 	content: string;
 } ): JSX.Element => {
 	return (
-		<Title
-			headingLevel="2"
+		<span
 			className={ classnames( className, 'wc-block-cart__totals-title' ) }
 		>
 			{ content }
-		</Title>
+		</span>
 	);
 };
 
diff --git a/assets/js/blocks/cart/inner-blocks/cart-order-summary-heading/edit.tsx b/assets/js/blocks/cart/inner-blocks/cart-order-summary-heading/edit.tsx
index ee105b65b6d..97600b63206 100644
--- a/assets/js/blocks/cart/inner-blocks/cart-order-summary-heading/edit.tsx
+++ b/assets/js/blocks/cart/inner-blocks/cart-order-summary-heading/edit.tsx
@@ -2,7 +2,6 @@
  * External dependencies
  */
 import { PlainText, useBlockProps } from '@wordpress/block-editor';
-import Title from '@woocommerce/base-components/title';
 import classnames from 'classnames';
 
 /**
@@ -24,8 +23,7 @@ export const Edit = ( {
 	const blockProps = useBlockProps();
 	return (
 		<div { ...blockProps }>
-			<Title
-				headingLevel="2"
+			<span
 				className={ classnames(
 					className,
 					'wc-block-cart__totals-title'
@@ -39,7 +37,7 @@ export const Edit = ( {
 					}
 					style={ { backgroundColor: 'transparent' } }
 				/>
-			</Title>
+			</span>
 		</div>
 	);
 };
diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-actions-block/style.scss b/assets/js/blocks/checkout/inner-blocks/checkout-actions-block/style.scss
index 15f3697cad1..c571526ab3d 100644
--- a/assets/js/blocks/checkout/inner-blocks/checkout-actions-block/style.scss
+++ b/assets/js/blocks/checkout/inner-blocks/checkout-actions-block/style.scss
@@ -10,8 +10,6 @@
 			height: auto;
 
 			.wc-block-components-button__text {
-				line-height: 24px;
-
 				> svg {
 					fill: $white;
 					vertical-align: top;
diff --git a/assets/js/blocks/checkout/styles/style.scss b/assets/js/blocks/checkout/styles/style.scss
index 530cdf40005..909251e26d0 100644
--- a/assets/js/blocks/checkout/styles/style.scss
+++ b/assets/js/blocks/checkout/styles/style.scss
@@ -51,17 +51,21 @@
 		.wc-block-components-panel > h2 {
 			@include font-size(regular);
 			@include reset-box();
+			@include reset-color();
 			@include reset-typography();
 			.wc-block-components-panel__button {
 				font-weight: 400;
 			}
 		}
 		.wc-block-components-totals-item,
-		.wc-block-components-totals-coupon-link,
 		.wc-block-components-panel {
 			padding-left: $gap;
 			padding-right: $gap;
 		}
+		.wc-block-components-totals-coupon-link {
+			margin-left: $gap;
+			margin-right: $gap;
+		}
 	}
 }
 // Skeleton is shown before mobile classes are appended.
@@ -78,11 +82,14 @@
 			padding: 0;
 			width: 100%;
 			.wc-block-components-totals-item,
-			.wc-block-components-totals-coupon-link,
 			.wc-block-components-panel {
 				padding-left: 0;
 				padding-right: 0;
 			}
+			.wc-block-components-totals-coupon-link {
+				margin-left: 0;
+				margin-right: 0;
+			}
 		}
 	}
 }
diff --git a/assets/js/blocks/rating-filter/style.scss b/assets/js/blocks/rating-filter/style.scss
index 80a7bdfb5a2..47c5e9e67fc 100644
--- a/assets/js/blocks/rating-filter/style.scss
+++ b/assets/js/blocks/rating-filter/style.scss
@@ -56,6 +56,7 @@
 	}
 
 	.wc-blocks-components-form-token-field-wrapper .components-form-token-field__input-container {
+		@include reset-color();
 		@include reset-typography();
 		border: 0;
 		padding: $gap-smaller;
diff --git a/assets/js/blocks/stock-filter/style.scss b/assets/js/blocks/stock-filter/style.scss
index 757d5c326a5..8e5f5c92127 100644
--- a/assets/js/blocks/stock-filter/style.scss
+++ b/assets/js/blocks/stock-filter/style.scss
@@ -78,6 +78,7 @@
 	}
 
 	.wc-blocks-components-form-token-field-wrapper .components-form-token-field__input-container {
+		@include reset-color();
 		@include reset-typography();
 		border: 0;
 		padding: $gap-smaller;
diff --git a/packages/checkout/components/checkbox-control/style.scss b/packages/checkout/components/checkbox-control/style.scss
index 638655db67b..71173748314 100644
--- a/packages/checkout/components/checkbox-control/style.scss
+++ b/packages/checkout/components/checkbox-control/style.scss
@@ -1,4 +1,5 @@
 .wc-block-components-checkbox {
+	@include reset-color();
 	@include reset-typography();
 	margin-top: em($gap-large);
 
diff --git a/packages/checkout/components/panel/style.scss b/packages/checkout/components/panel/style.scss
index 7af200c5ce7..32cf06ef726 100644
--- a/packages/checkout/components/panel/style.scss
+++ b/packages/checkout/components/panel/style.scss
@@ -34,6 +34,7 @@
 	&:hover,
 	&:focus,
 	&:active {
+		@include reset-color();
 		@include reset-typography();
 		background: transparent;
 		box-shadow: none;
diff --git a/packages/checkout/components/text-input/style.scss b/packages/checkout/components/text-input/style.scss
index 10ec555ce98..56854396832 100644
--- a/packages/checkout/components/text-input/style.scss
+++ b/packages/checkout/components/text-input/style.scss
@@ -5,6 +5,7 @@
 	white-space: nowrap;
 
 	label {
+		@include reset-color();
 		@include reset-typography();
 		@include font-size(regular);
 		position: absolute;
diff --git a/tests/utils/shopper.js b/tests/utils/shopper.js
index 99855e58b3d..2184c7ec5fb 100644
--- a/tests/utils/shopper.js
+++ b/tests/utils/shopper.js
@@ -396,10 +396,10 @@ export const shopper = {
 
 		addCrossSellsProductToCart: async () => {
 			await page.waitForSelector(
-				'.wc-block-components-product-add-to-cart-button'
+				'.wp-block-cart-cross-sells-product__product-add-to-cart .wc-block-components-product-button__button'
 			);
 			expect( page ).toClick(
-				'.wc-block-components-product-add-to-cart-button'
+				'.wp-block-cart-cross-sells-product__product-add-to-cart .wc-block-components-product-button__button'
 			);
 		},