diff --git a/assets/css/wc-setup.scss b/assets/css/wc-setup.scss
index 85d53961e21..91f9f06f07c 100644
--- a/assets/css/wc-setup.scss
+++ b/assets/css/wc-setup.scss
@@ -1242,7 +1242,7 @@ p.jetpack-terms {
 	}
 }
 
-.recommended-step {
+.wc-setup-content .recommended-step {
 	border: 1px solid #ebebeb;
 	border-radius: 4px;
 	padding: 2.5em;
@@ -1250,15 +1250,22 @@ p.jetpack-terms {
 	li {
 		list-style: none;
 
-		&:last-child .recommended-item {
+		&:last-child label {
 			margin-bottom: 0; // Avoid extra space at the end of the list.
 		}
 	}
 
-	.recommended-item {
+	label {
 		display: flex;
 		align-items: center;
 		margin-bottom: 1.5em;
+
+		&:before, &:after {
+			top: auto;
+		}
+		&:after {
+			margin-top: -1.5px;
+		}
 	}
 
 	.recommended-item-icon {
@@ -1266,7 +1273,7 @@ p.jetpack-terms {
 		border-radius: 7px;
 		height: 3.5em;
 		margin-right: 1em;
-		margin-left: 1em;
+		margin-left: 4px;
 
 		&.recommended-item-icon-storefront_theme {
 			background-color: #f4a224;
diff --git a/assets/js/admin/wc-setup.js b/assets/js/admin/wc-setup.js
index ff6e35c7626..6a390f0701c 100644
--- a/assets/js/admin/wc-setup.js
+++ b/assets/js/admin/wc-setup.js
@@ -207,7 +207,7 @@ jQuery( function( $ ) {
 			} );
 		} );
 
-		$( '.recommended-item-checkbox:checked' ).each( function() {
+		$( '.recommended-item input:checked' ).each( function() {
 			addPlugins( pluginLinkBySlug, $( this ), '.recommended-item' );
 		} );
 
diff --git a/includes/admin/class-wc-admin-setup-wizard.php b/includes/admin/class-wc-admin-setup-wizard.php
index 4f51e3d26ba..3268b6fea3d 100644
--- a/includes/admin/class-wc-admin-setup-wizard.php
+++ b/includes/admin/class-wc-admin-setup-wizard.php
@@ -1682,16 +1682,16 @@ class WC_Admin_Setup_Wizard {
 		$img_url     = $item_info['img_url'];
 		$img_alt     = $item_info['img_alt'];
 		?>
-		<li>
-			<label class="recommended-item">
-				<input
-					class="recommended-item-checkbox"
-					type="checkbox"
-					name="<?php echo esc_attr( 'setup_' . $type ); ?>"
-					value="yes"
-					checked
-					data-plugins="<?php echo esc_attr( json_encode( isset( $item_info['plugins'] ) ? $item_info['plugins'] : null ) ); ?>"
-				/>
+		<li class="recommended-item checkbox">
+			<input
+				id="<?php echo esc_attr( 'wc_recommended_' . $type ); ?>"
+				type="checkbox"
+				name="<?php echo esc_attr( 'setup_' . $type ); ?>"
+				value="yes"
+				checked
+				data-plugins="<?php echo esc_attr( json_encode( isset( $item_info['plugins'] ) ? $item_info['plugins'] : null ) ); ?>"
+			/>
+			<label for="<?php echo esc_attr( 'wc_recommended_' . $type ); ?>">
 				<img
 					src="<?php echo esc_url( $img_url ); ?>"
 					class="<?php echo esc_attr( 'recommended-item-icon-' . $type ); ?> recommended-item-icon"