diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index 514fb151..9da50e49 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -482,15 +482,15 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 			$output .= '<label for="' . $key . UM()->form()->form_suffix . '">' . __( $label, 'ultimate-member' ) . '</label>';
 
-			if (isset( $data['help'] ) && !empty( $data['help'] ) && $this->viewing == false && !strstr( $key, 'confirm_user_pass' )) {
+			if ( isset( $data['help'] ) && !empty( $data['help'] ) && $this->viewing == false && !strstr( $key, 'confirm_user_pass' ) ) {
 
-				if (!UM()->mobile()->isMobile()) {
-					if (!isset( $this->disable_tooltips )) {
-						$output .= '<span class="um-tip um-tip-w" title="' . __( $data['help'], 'ultimate-member' ) . '"><i class="um-icon-help-circled"></i></span>';
+				if ( ! UM()->mobile()->isMobile() ) {
+					if ( !isset( $this->disable_tooltips ) ) {
+						$output .= '<span class="um-tip um-tip-' . ( is_rtl() ? 'e' : 'w' ) . '" title="' . __( $data['help'], 'ultimate-member' ) . '"><i class="um-icon-help-circled"></i></span>';
 					}
 				}
 
-				if (UM()->mobile()->isMobile() || isset( $this->disable_tooltips )) {
+				if ( UM()->mobile()->isMobile() || isset( $this->disable_tooltips ) ) {
 					$output .= '<span class="um-tip-text">' . __( $data['help'], 'ultimate-member' ) . '</span>';
 				}
 
diff --git a/templates/account.php b/templates/account.php
index bc65e70a..de0d1d57 100644
--- a/templates/account.php
+++ b/templates/account.php
@@ -67,7 +67,7 @@
 
 					<?php } else { ?>
 
-						<div class="um-account-meta-img-b uimob800-show um-tip-w" title="<?php echo esc_attr( um_user( 'display_name' ) ); ?>">
+						<div class="um-account-meta-img-b uimob800-show um-tip-<?php echo ( is_rtl() ? 'e' : 'w' ); ?>" title="<?php echo esc_attr( um_user( 'display_name' ) ); ?>">
 							<a href="<?php echo esc_url( um_user_profile_url() ); ?>">
 								<?php echo get_avatar( um_user('ID'), 120 ); ?>
 							</a>
@@ -99,7 +99,7 @@
 											<i class="<?php echo esc_attr( $info['icon'] ); ?>"></i>
 										</span>
 									<?php } else { ?>
-										<span class="um-account-icontip uimob800-show um-tip-w" title="<?php echo esc_attr( $info['title'] ); ?>">
+										<span class="um-account-icontip uimob800-show um-tip-<?php echo ( is_rtl() ? 'e' : 'w' ); ?>" title="<?php echo esc_attr( $info['title'] ); ?>">
 											<i class="<?php echo esc_attr( $info['icon'] ); ?>"></i>
 										</span>
 									<?php } ?>