diff --git a/templates/checkout/form-billing.php b/templates/checkout/form-billing.php
index b4a51b8cb04..06fcb72fb28 100644
--- a/templates/checkout/form-billing.php
+++ b/templates/checkout/form-billing.php
@@ -49,8 +49,8 @@ if ( ! defined( 'ABSPATH' ) ) {
 		<?php if ( $checkout->enable_guest_checkout ) : ?>
 
 			<p class="form-row form-row-wide create-account">
-				<label class="checkbox">
-					<input class="input-checkbox" id="createaccount" <?php checked( ( true === $checkout->get_value( 'createaccount' ) || ( true === apply_filters( 'woocommerce_create_account_default_checked', false ) ) ), true ) ?> type="checkbox" name="createaccount" value="1" /> <span><?php _e( 'Create an account?', 'woocommerce' ); ?></span>
+				<label class="woocommerce-form__label woocommerce-form__label--for-checkbox checkbox">
+					<input class="woocommerce-form__input woocommerce-form__input--checkbox input-checkbox" id="createaccount" <?php checked( ( true === $checkout->get_value( 'createaccount' ) || ( true === apply_filters( 'woocommerce_create_account_default_checked', false ) ) ), true ) ?> type="checkbox" name="createaccount" value="1" /> <span><?php _e( 'Create an account?', 'woocommerce' ); ?></span>
 				</label>
 			</p>
 
diff --git a/templates/checkout/form-shipping.php b/templates/checkout/form-shipping.php
index f0b760b662b..e5b6a3e56aa 100644
--- a/templates/checkout/form-shipping.php
+++ b/templates/checkout/form-shipping.php
@@ -25,8 +25,8 @@ if ( ! defined( 'ABSPATH' ) ) {
 	<?php if ( true === WC()->cart->needs_shipping_address() ) : ?>
 
 		<h3 id="ship-to-different-address">
-			<label class="checkbox">
-				<input id="ship-to-different-address-checkbox" class="input-checkbox" <?php checked( apply_filters( 'woocommerce_ship_to_different_address_checked', 'shipping' === get_option( 'woocommerce_ship_to_destination' ) ? 1 : 0 ), 1 ); ?> type="checkbox" name="ship_to_different_address" value="1" /> <span><?php _e( 'Ship to a different address?', 'woocommerce' ); ?></span>
+			<label class="woocommerce-form__label woocommerce-form__label--for-checkbox checkbox">
+				<input id="ship-to-different-address-checkbox" class="woocommerce-form__input woocommerce-form__input--checkbox input-checkbox" <?php checked( apply_filters( 'woocommerce_ship_to_different_address_checked', 'shipping' === get_option( 'woocommerce_ship_to_destination' ) ? 1 : 0 ), 1 ); ?> type="checkbox" name="ship_to_different_address" value="1" /> <span><?php _e( 'Ship to a different address?', 'woocommerce' ); ?></span>
 			</label>
 		</h3>
 
diff --git a/templates/checkout/terms.php b/templates/checkout/terms.php
index 7e4e63dc4de..3bddf552df8 100644
--- a/templates/checkout/terms.php
+++ b/templates/checkout/terms.php
@@ -13,8 +13,8 @@ if ( ! defined( 'ABSPATH' ) ) {
 if ( wc_get_page_id( 'terms' ) > 0 && apply_filters( 'woocommerce_checkout_show_terms', true ) ) : ?>
 	<?php do_action( 'woocommerce_checkout_before_terms_and_conditions' ); ?>
 	<p class="form-row terms wc-terms-and-conditions">
-		<label class="checkbox">
-			<input type="checkbox" class="input-checkbox" name="terms" <?php checked( apply_filters( 'woocommerce_terms_is_checked_default', isset( $_POST['terms'] ) ), true ); ?> id="terms" /> <span><?php printf( __( 'I&rsquo;ve read and accept the <a href="%s" target="_blank">terms &amp; conditions</a>', 'woocommerce' ), esc_url( wc_get_page_permalink( 'terms' ) ) ); ?></span> <span class="required">*</span>
+		<label class="woocommerce-form__label woocommerce-form__label--for-checkbox checkbox">
+			<input type="checkbox" class="woocommerce-form__input woocommerce-form__input--checkbox input-checkbox" name="terms" <?php checked( apply_filters( 'woocommerce_terms_is_checked_default', isset( $_POST['terms'] ) ), true ); ?> id="terms" /> <span><?php printf( __( 'I&rsquo;ve read and accept the <a href="%s" target="_blank">terms &amp; conditions</a>', 'woocommerce' ), esc_url( wc_get_page_permalink( 'terms' ) ) ); ?></span> <span class="required">*</span>
 		</label>
 		<input type="hidden" name="terms-field" value="1" />
 	</p>
diff --git a/templates/global/form-login.php b/templates/global/form-login.php
index d141da0594d..af75eedc236 100644
--- a/templates/global/form-login.php
+++ b/templates/global/form-login.php
@@ -25,7 +25,7 @@ if ( is_user_logged_in() ) {
 }
 
 ?>
-<form method="post" class="login" <?php if ( $hidden ) echo 'style="display:none;"'; ?>>
+<form class="woocomerce-form woocommerce-form--login" method="post" class="login" <?php if ( $hidden ) echo 'style="display:none;"'; ?>>
 
 	<?php do_action( 'woocommerce_login_form_start' ); ?>
 
@@ -47,8 +47,8 @@ if ( is_user_logged_in() ) {
 		<?php wp_nonce_field( 'woocommerce-login' ); ?>
 		<input type="submit" class="button" name="login" value="<?php esc_attr_e( 'Login', 'woocommerce' ); ?>" />
 		<input type="hidden" name="redirect" value="<?php echo esc_url( $redirect ) ?>" />
-		<label class="inline">
-			<input name="rememberme" type="checkbox" id="rememberme" value="forever" /> <span><?php _e( 'Remember me', 'woocommerce' ); ?></span>
+		<label class="woocommerce-form__label woocommerce-form__label--for-checkbox inline">
+			<input class="woocommerce-form__input woocommerce-form__input--checkbox" name="rememberme" type="checkbox" id="rememberme" value="forever" /> <span><?php _e( 'Remember me', 'woocommerce' ); ?></span>
 		</label>
 	</p>
 	<p class="lost_password">
diff --git a/templates/myaccount/form-login.php b/templates/myaccount/form-login.php
index e85a40af131..dcf3ff95ba6 100644
--- a/templates/myaccount/form-login.php
+++ b/templates/myaccount/form-login.php
@@ -36,7 +36,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 		<h2><?php _e( 'Login', 'woocommerce' ); ?></h2>
 
-		<form method="post" class="login">
+		<form class="woocomerce-form woocommerce-form--login" method="post" class="login">
 
 			<?php do_action( 'woocommerce_login_form_start' ); ?>
 
@@ -54,8 +54,8 @@ if ( ! defined( 'ABSPATH' ) ) {
 			<p class="form-row">
 				<?php wp_nonce_field( 'woocommerce-login', 'woocommerce-login-nonce' ); ?>
 				<input type="submit" class="woocommerce-Button button" name="login" value="<?php esc_attr_e( 'Login', 'woocommerce' ); ?>" />
-				<label class="inline">
-					<input class="woocommerce-Input woocommerce-Input--checkbox" name="rememberme" type="checkbox" id="rememberme" value="forever" /> <span><?php _e( 'Remember me', 'woocommerce' ); ?></span>
+				<label class="woocommerce-form__label woocommerce-form__label--for-checkbox inline">
+					<input class="woocommerce-form__input woocommerce-form__input--checkbox" name="rememberme" type="checkbox" id="rememberme" value="forever" /> <span><?php _e( 'Remember me', 'woocommerce' ); ?></span>
 				</label>
 			</p>
 			<p class="woocommerce-LostPassword lost_password">