diff --git a/classes/helpers/FrmHtmlHelper.php b/classes/helpers/FrmHtmlHelper.php
index f9f2e30189..f47d42fcff 100644
--- a/classes/helpers/FrmHtmlHelper.php
+++ b/classes/helpers/FrmHtmlHelper.php
@@ -119,7 +119,7 @@ public static function echo_unit_input( $args = array() ) {
 			<input type="hidden" value="<?php echo esc_attr( $hidden_value ); ?>" <?php FrmAppHelper::array_to_html_params( $args['field_attrs'], true ); ?> />
 			<input <?php FrmAppHelper::array_to_html_params( $input_number_attrs, true ); ?> />
 			<span class="frm-input-group-suffix">
-				<select aria-label="<?php echo esc_attr__( 'Select unit', 'formidable' ); ?>" tabindex="0">
+				<select aria-label="<?php esc_attr_e( 'Select unit', 'formidable' ); ?>" tabindex="0">
 					<?php
 					foreach ( $units as $unit ) {
 						self::echo_dropdown_option( $unit, $unit === ( $selected_unit ?? $args['default_unit'] ), array( 'value' => $unit ) );
diff --git a/classes/views/dashboard/templates/notification-banner.php b/classes/views/dashboard/templates/notification-banner.php
index 952732159d..3ba6b60fe5 100644
--- a/classes/views/dashboard/templates/notification-banner.php
+++ b/classes/views/dashboard/templates/notification-banner.php
@@ -10,11 +10,11 @@
 		<?php FrmAppHelper::icon_by_class( 'frmfont frm_speaker_icon' ); ?>
 		<span class="frm-vertical-line"></span>
 		<div>
-			<h4><?php echo esc_html__( 'Welcome to Formidable Forms', 'formidable' ); ?> 🎉</h4>
-			<p><?php echo esc_html__( 'Whether you\'re looking to create simple contact forms or complex survey forms, Formidable Forms has you covered.', 'formidable' ); ?></p>
+			<h4><?php esc_html_e( 'Welcome to Formidable Forms', 'formidable' ); ?> 🎉</h4>
+			<p><?php esc_html_e( 'Whether you\'re looking to create simple contact forms or complex survey forms, Formidable Forms has you covered.', 'formidable' ); ?></p>
 		</div>
 		<div class="frm-shrink-0">
-			<a target="_blank" href="<?php echo esc_url( FrmAppHelper::admin_upgrade_link( '', 'features' ) ); ?>" class="frm-button-secondary"><?php echo esc_html__( 'Check All Features', 'formidable' ); ?></a>
+			<a target="_blank" href="<?php echo esc_url( FrmAppHelper::admin_upgrade_link( '', 'features' ) ); ?>" class="frm-button-secondary"><?php esc_html_e( 'Check All Features', 'formidable' ); ?></a>
 		</div>
 	</div>
 </div>
diff --git a/classes/views/form-templates/template.php b/classes/views/form-templates/template.php
index 4479b853cf..18c52047dd 100644
--- a/classes/views/form-templates/template.php
+++ b/classes/views/form-templates/template.php
@@ -88,7 +88,7 @@
 						esc_html( date_i18n( get_option( 'date_format' ), strtotime( $template['created_at'] ) ) )
 					);
 				} else {
-					echo esc_html__( 'No description', 'formidable' );
+					esc_html_e( 'No description', 'formidable' );
 				}
 				?>
 			</p>
diff --git a/classes/views/shared/errors.php b/classes/views/shared/errors.php
index 9e5d7c89d3..979b12df21 100644
--- a/classes/views/shared/errors.php
+++ b/classes/views/shared/errors.php
@@ -48,7 +48,7 @@
 if ( ! empty( $warnings ) && is_array( $warnings ) ) {
 	?>
 	<div class="frm_warning_style inline" role="alert">
-		<div class="frm_warning_heading"> <?php echo esc_html__( 'Warning:', 'formidable' ); ?></div>
+		<div class="frm_warning_heading"> <?php esc_html_e( 'Warning:', 'formidable' ); ?></div>
 		<ul id="frm_warnings">
 			<?php
 			foreach ( $warnings as $warning ) {
diff --git a/classes/views/styles/components/templates/slider.php b/classes/views/styles/components/templates/slider.php
index 49a100facd..e9cae9feb9 100644
--- a/classes/views/styles/components/templates/slider.php
+++ b/classes/views/styles/components/templates/slider.php
@@ -17,8 +17,8 @@
 					</span>
 				</div>
 				<div class="frm-slider-value">
-					<input aria-label="<?php echo esc_attr__( 'Vertical value', 'formidable' ); ?>" type="text" value="<?php echo esc_attr( $component['vertical']['value'] ); ?>" />
-					<select aria-label="<?php echo esc_attr__( 'Value unit', 'formidable' ); ?>">
+					<input aria-label="<?php esc_attr_e( 'Vertical value', 'formidable' ); ?>" type="text" value="<?php echo esc_attr( $component['vertical']['value'] ); ?>" />
+					<select aria-label="<?php esc_attr_e( 'Value unit', 'formidable' ); ?>">
 						<?php foreach ( $component['units'] as $unit ) : ?>
 							<option <?php selected( $component['vertical']['unit'], $unit ); ?> value="<?php echo esc_attr( $unit ); ?>"><?php echo esc_html( $unit ); ?></option>
 						<?php endforeach; ?>
@@ -39,8 +39,8 @@
 					</span>
 				</div>
 				<div class="frm-slider-value">
-					<input aria-label="<?php echo esc_attr__( 'Top value', 'formidable' ); ?>" type="text" value="<?php echo esc_attr( $component['top']['value'] ); ?>" />
-					<select aria-label="<?php echo esc_attr__( 'Value unit', 'formidable' ); ?>">
+					<input aria-label="<?php esc_attr_e( 'Top value', 'formidable' ); ?>" type="text" value="<?php echo esc_attr( $component['top']['value'] ); ?>" />
+					<select aria-label="<?php esc_attr_e( 'Value unit', 'formidable' ); ?>">
 						<?php foreach ( $component['units'] as $unit ) : ?>
 							<option <?php selected( $component['top']['unit'], $unit ); ?> value="<?php echo esc_attr( $unit ); ?>"><?php echo esc_html( $unit ); ?></option>
 						<?php endforeach; ?>
@@ -61,8 +61,8 @@
 					</span>
 				</div>
 				<div class="frm-slider-value">
-					<input aria-label="<?php echo esc_attr__( 'Bottom value', 'formidable' ); ?>" type="text" value="<?php echo esc_attr( $component['bottom']['value'] ); ?>" />
-					<select aria-label="<?php echo esc_attr__( 'Value unit', 'formidable' ); ?>">
+					<input aria-label="<?php esc_attr_e( 'Bottom value', 'formidable' ); ?>" type="text" value="<?php echo esc_attr( $component['bottom']['value'] ); ?>" />
+					<select aria-label="<?php esc_attr_e( 'Value unit', 'formidable' ); ?>">
 						<?php foreach ( $component['units'] as $unit ) : ?>
 							<option <?php selected( $component['bottom']['unit'], $unit ); ?> value="<?php echo esc_attr( $unit ); ?>"><?php echo esc_html( $unit ); ?></option>
 						<?php endforeach; ?>
@@ -83,8 +83,8 @@
 					</span>
 				</div>
 				<div class="frm-slider-value">
-					<input aria-label="<?php echo esc_attr__( 'Horizontal value', 'formidable' ); ?>" type="text" value="<?php echo esc_attr( $component['horizontal']['value'] ); ?>" />
-					<select aria-label="<?php echo esc_attr__( 'Value unit', 'formidable' ); ?>">
+					<input aria-label="<?php esc_attr_e( 'Horizontal value', 'formidable' ); ?>" type="text" value="<?php echo esc_attr( $component['horizontal']['value'] ); ?>" />
+					<select aria-label="<?php esc_attr_e( 'Value unit', 'formidable' ); ?>">
 						<?php foreach ( $component['units'] as $unit ) : ?>
 							<option <?php selected( $component['horizontal']['unit'], $unit ); ?> value="<?php echo esc_attr( $unit ); ?>"><?php echo esc_html( $unit ); ?></option>
 						<?php endforeach; ?>
@@ -105,8 +105,8 @@
 					</span>
 				</div>
 				<div class="frm-slider-value">
-					<input aria-label="<?php echo esc_attr__( 'Left value', 'formidable' ); ?>" type="text" value="<?php echo esc_attr( $component['left']['value'] ); ?>" />
-					<select aria-label="<?php echo esc_attr__( 'Value unit', 'formidable' ); ?>">
+					<input aria-label="<?php esc_attr_e( 'Left value', 'formidable' ); ?>" type="text" value="<?php echo esc_attr( $component['left']['value'] ); ?>" />
+					<select aria-label="<?php esc_attr_e( 'Value unit', 'formidable' ); ?>">
 						<?php foreach ( $component['units'] as $unit ) : ?>
 							<option <?php selected( $component['left']['unit'], $unit ); ?> value="<?php echo esc_attr( $unit ); ?>"><?php echo esc_html( $unit ); ?></option>
 						<?php endforeach; ?>
@@ -127,8 +127,8 @@
 					</span>
 				</div>
 				<div class="frm-slider-value">
-					<input aria-label="<?php echo esc_attr__( 'Right value', 'formidable' ); ?>" type="text" value="<?php echo esc_attr( $component['right']['value'] ); ?>" />
-					<select aria-label="<?php echo esc_attr__( 'Value unit', 'formidable' ); ?>">
+					<input aria-label="<?php esc_attr_e( 'Right value', 'formidable' ); ?>" type="text" value="<?php echo esc_attr( $component['right']['value'] ); ?>" />
+					<select aria-label="<?php esc_attr_e( 'Value unit', 'formidable' ); ?>">
 						<?php foreach ( $component['units'] as $unit ) : ?>
 							<option <?php selected( $component['right']['unit'], $unit ); ?> value="<?php echo esc_attr( $unit ); ?>"><?php echo esc_html( $unit ); ?></option>
 						<?php endforeach; ?>
@@ -156,9 +156,9 @@
 						</span>
 					</div>
 					<div class="frm-slider-value">
-						<input aria-label="<?php echo esc_attr__( 'Field value', 'formidable' ); ?>" type="text" value="<?php echo esc_attr( $component['value_label'] ); ?>" />
+						<input aria-label="<?php esc_attr_e( 'Field value', 'formidable' ); ?>" type="text" value="<?php echo esc_attr( $component['value_label'] ); ?>" />
 						<input type="hidden" <?php echo esc_attr( $field_name ); ?> value="<?php echo esc_attr( $field_value ); ?>" id="<?php echo esc_attr( $component['id'] ); ?>" />
-						<select aria-label="<?php echo esc_attr__( 'Value unit', 'formidable' ); ?>">
+						<select aria-label="<?php esc_attr_e( 'Value unit', 'formidable' ); ?>">
 							<?php foreach ( $component['units'] as $unit ) : ?>
 								<option <?php selected( $component['unit_measurement'], $unit ); ?> value="<?php echo esc_attr( $unit ); ?>"><?php echo esc_html( $unit ); ?></option>
 							<?php endforeach; ?>
@@ -181,8 +181,8 @@
 							</span>
 						</div>
 						<div class="frm-slider-value">
-							<input aria-label="<?php echo esc_attr__( 'Field value', 'formidable' ); ?>" type="text" value="<?php echo esc_attr( $component['value_label'] ); ?>" />
-							<select aria-label="<?php echo esc_attr__( 'Value unit', 'formidable' ); ?>">
+							<input aria-label="<?php esc_attr_e( 'Field value', 'formidable' ); ?>" type="text" value="<?php echo esc_attr( $component['value_label'] ); ?>" />
+							<select aria-label="<?php esc_attr_e( 'Value unit', 'formidable' ); ?>">
 								<?php foreach ( $component['units'] as $unit ) : ?>
 									<option <?php selected( $component['unit_measurement'], $unit ); ?> value="<?php echo esc_attr( $unit ); ?>"><?php echo esc_html( $unit ); ?></option>
 								<?php endforeach; ?>
@@ -208,9 +208,9 @@
 									</span>
 								</div>
 								<div class="frm-slider-value">
-									<input aria-label="<?php echo esc_attr__( 'Field value', 'formidable' ); ?>" type="text" value="<?php echo empty( $component['unit_measurement'] ) ? esc_attr( $field['value'] ) : (int) $field['value']; ?>" />
+									<input aria-label="<?php esc_attr_e( 'Field value', 'formidable' ); ?>" type="text" value="<?php echo empty( $component['unit_measurement'] ) ? esc_attr( $field['value'] ) : (int) $field['value']; ?>" />
 									<input type="hidden" name="<?php echo esc_attr( $field['name'] ); ?>" value="<?php echo esc_attr( $field['value'] ); ?>" id="<?php echo esc_attr( $field['id'] ); ?>" />
-									<select aria-label="<?php echo esc_attr__( 'Value unit', 'formidable' ); ?>">
+									<select aria-label="<?php esc_attr_e( 'Value unit', 'formidable' ); ?>">
 										<?php foreach ( $component['units'] as $unit ) : ?>
 											<option <?php selected( $component['unit_measurement'], $unit ); ?> value="<?php echo esc_attr( $unit ); ?>"><?php echo esc_html( $unit ); ?></option>
 										<?php endforeach; ?>
diff --git a/phpcs-sniffs/Formidable/Sniffs/CodeAnalysis/PreferEscHtmlESniff.php b/phpcs-sniffs/Formidable/Sniffs/CodeAnalysis/PreferEscHtmlESniff.php
index 8ccae19009..f20499840b 100644
--- a/phpcs-sniffs/Formidable/Sniffs/CodeAnalysis/PreferEscHtmlESniff.php
+++ b/phpcs-sniffs/Formidable/Sniffs/CodeAnalysis/PreferEscHtmlESniff.php
@@ -18,6 +18,8 @@
  * - echo esc_attr( __( ... ) ) -> esc_attr_e( ... )
  * - echo esc_html( _x( ... ) ) -> esc_html_x( ... )
  * - echo esc_attr( _x( ... ) ) -> esc_attr_x( ... )
+ * - echo esc_html__( ... ) -> esc_html_e( ... )
+ * - echo esc_attr__( ... ) -> esc_attr_e( ... )
  */
 class PreferEscHtmlESniff implements Sniff {
 
@@ -37,6 +39,16 @@ class PreferEscHtmlESniff implements Sniff {
 		),
 	);
 
+	/**
+	 * Mapping of already combined functions that should drop echo entirely.
+	 *
+	 * @var array
+	 */
+	private $directReplacements = array(
+		'esc_html__' => 'esc_html_e',
+		'esc_attr__' => 'esc_attr_e',
+	);
+
 	/**
 	 * Returns an array of tokens this test wants to listen for.
 	 *
@@ -71,6 +83,11 @@ public function process( File $phpcsFile, $stackPtr ) {
 
 		$escapeFunc = $tokens[ $nextToken ]['content'];
 
+		if ( isset( $this->directReplacements[ $escapeFunc ] ) ) {
+			$this->processDirectCombinedFunction( $phpcsFile, $stackPtr, $nextToken, $escapeFunc );
+			return;
+		}
+
 		if ( ! isset( $this->replacements[ $escapeFunc ] ) ) {
 			return;
 		}
@@ -144,17 +161,76 @@ public function process( File $phpcsFile, $stackPtr ) {
 		);
 
 		if ( true === $fix ) {
-			$phpcsFile->fixer->beginChangeset();
+			$this->replaceEchoWithCombinedFunction( $phpcsFile, $stackPtr, $semicolon, $replacementFunc, $translateArgs );
+		}
+	}
+
+	/**
+	 * Handle echo statements that already use combined translation helpers.
+	 *
+	 * @param File   $phpcsFile       The file being scanned.
+	 * @param int    $stackPtr        Pointer to the echo token.
+	 * @param int    $functionPointer Pointer to the combined function token.
+	 * @param string $functionName    The function currently in use (e.g. esc_html__).
+	 *
+	 * @return void
+	 */
+	private function processDirectCombinedFunction( File $phpcsFile, $stackPtr, $functionPointer, $functionName ) {
+		$tokens = $phpcsFile->getTokens();
+
+		$openParen = $phpcsFile->findNext( T_WHITESPACE, $functionPointer + 1, null, true );
+
+		if ( false === $openParen || $tokens[ $openParen ]['code'] !== T_OPEN_PARENTHESIS ) {
+			return;
+		}
+
+		if ( ! isset( $tokens[ $openParen ]['parenthesis_closer'] ) ) {
+			return;
+		}
+
+		$closeParen = $tokens[ $openParen ]['parenthesis_closer'];
+
+		$semicolon = $phpcsFile->findNext( T_WHITESPACE, $closeParen + 1, null, true );
+
+		if ( false === $semicolon || $tokens[ $semicolon ]['code'] !== T_SEMICOLON ) {
+			return;
+		}
+
+		$args            = $phpcsFile->getTokensAsString( $openParen + 1, $closeParen - $openParen - 1 );
+		$replacementFunc = $this->directReplacements[ $functionName ];
+
+		$fix = $phpcsFile->addFixableError(
+			'Use %s() instead of echo %s().',
+			$stackPtr,
+			'PreferCombinedFunctionDirect',
+			array( $replacementFunc, $functionName )
+		);
 
-			// Remove everything from echo to the semicolon.
-			for ( $i = $stackPtr; $i <= $semicolon; $i++ ) {
-				$phpcsFile->fixer->replaceToken( $i, '' );
-			}
+		if ( true === $fix ) {
+			$this->replaceEchoWithCombinedFunction( $phpcsFile, $stackPtr, $semicolon, $replacementFunc, $args );
+		}
+	}
 
-			// Add the new combined function call.
-			$phpcsFile->fixer->addContent( $stackPtr, $replacementFunc . '( ' . trim( $translateArgs ) . ' );' );
+	/**
+	 * Replace an echo statement with the combined helper.
+	 *
+	 * @param File   $phpcsFile      The file being scanned.
+	 * @param int    $stackPtr       Pointer to the echo token.
+	 * @param int    $semicolonPtr   Pointer to the semicolon.
+	 * @param string $replacement    Function name to use.
+	 * @param string $argumentString Function arguments as a string.
+	 *
+	 * @return void
+	 */
+	private function replaceEchoWithCombinedFunction( File $phpcsFile, $stackPtr, $semicolonPtr, $replacement, $argumentString ) {
+		$phpcsFile->fixer->beginChangeset();
 
-			$phpcsFile->fixer->endChangeset();
+		for ( $i = $stackPtr; $i <= $semicolonPtr; $i++ ) {
+			$phpcsFile->fixer->replaceToken( $i, '' );
 		}
+
+		$phpcsFile->fixer->addContent( $stackPtr, $replacement . '( ' . trim( $argumentString ) . ' );' );
+
+		$phpcsFile->fixer->endChangeset();
 	}
 }
diff --git a/stripe/views/payments/show.php b/stripe/views/payments/show.php
index e2a1e69e5b..0dc525ae9b 100755
--- a/stripe/views/payments/show.php
+++ b/stripe/views/payments/show.php
@@ -170,7 +170,7 @@
 					<?php endif; ?>
 
 					<div class="misc-pub-section">
-						<a href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'frm_action', 'destroy' ) ) ); ?>" data-frmverify="<?php echo esc_attr__( 'Permanently delete this payment?', 'formidable' ); ?>" data-frmverify-btn="frm-button-red" title="<?php esc_attr_e( 'Delete', 'formidable' ); ?>">
+						<a href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'frm_action', 'destroy' ) ) ); ?>" data-frmverify="<?php esc_attr_e( 'Permanently delete this payment?', 'formidable' ); ?>" data-frmverify-btn="frm-button-red" title="<?php esc_attr_e( 'Delete', 'formidable' ); ?>">
 							<?php FrmAppHelper::icon_by_class( 'frmfont frm_delete_icon' ); ?>
 							<span class="frm_link_label">
 								<?php esc_html_e( 'Delete Payment', 'formidable' ); ?>
diff --git a/stripe/views/subscriptions/show.php b/stripe/views/subscriptions/show.php
index acf623e3e2..36e4857cc1 100755
--- a/stripe/views/subscriptions/show.php
+++ b/stripe/views/subscriptions/show.php
@@ -126,7 +126,7 @@
 							</div>
 
 							<div id="misc-pub-section">
-								<a class="submitdelete deletion" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'frm_action', 'destroy' ) ) ); ?>" data-frmverify="<?php echo esc_attr__( 'Permanently delete this subscription?', 'formidable' ); ?>" data-frmverify-btn="frm-button-red" title="<?php esc_attr_e( 'Delete', 'formidable' ); ?>">
+								<a class="submitdelete deletion" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'frm_action', 'destroy' ) ) ); ?>" data-frmverify="<?php esc_attr_e( 'Permanently delete this subscription?', 'formidable' ); ?>" data-frmverify-btn="frm-button-red" title="<?php esc_attr_e( 'Delete', 'formidable' ); ?>">
 									<?php FrmAppHelper::icon_by_class( 'frmfont frm_delete_icon' ); ?>
 									<span class="frm_link_label">
 										<?php esc_html_e( 'Delete Subscription', 'formidable' ); ?>