diff --git src/bp-activity/bp-activity-admin.php src/bp-activity/bp-activity-admin.php
index 0eb1e610a..e8e4d74e4 100644
--- src/bp-activity/bp-activity-admin.php
+++ src/bp-activity/bp-activity-admin.php
@@ -203,6 +203,7 @@ function bp_activity_admin_load() {
 	$bp       = buddypress();
 	$doaction = bp_admin_list_table_current_bulk_action();
 	$min      = bp_core_get_minified_asset_suffix();
+	$rtl      = is_rtl() ? '-rtl' : '';
 
 	/**
 	 * Fires at top of Activity admin page.
@@ -308,9 +309,8 @@ function bp_activity_admin_load() {
 	wp_localize_script( 'bp_activity_admin_js', 'bp_activity_admin_vars', array(
 		'page' => get_current_screen()->id
 	) );
-	wp_enqueue_style( 'bp_activity_admin_css', $bp->plugin_url . "bp-activity/admin/css/admin{$min}.css", array(),                               bp_get_version()       );
+	wp_enqueue_style( 'bp_activity_admin_css', $bp->plugin_url . "bp-activity/admin/css/admin{$rtl}{$min}.css", array(),                         bp_get_version()       );
 
-	wp_style_add_data( 'bp_activity_admin_css', 'rtl', true );
 	if ( $min ) {
 		wp_style_add_data( 'bp_activity_admin_css', 'suffix', $min );
 	}
diff --git src/bp-activity/bp-activity-cssjs.php src/bp-activity/bp-activity-cssjs.php
index ec14cd416..cc40b48e7 100644
--- src/bp-activity/bp-activity-cssjs.php
+++ src/bp-activity/bp-activity-cssjs.php
@@ -32,11 +32,11 @@ function bp_activity_mentions_script() {
 
 
 	$min = bp_core_get_minified_asset_suffix();
+	$rtl = is_rtl() ? '-rtl' : '';
 
 	wp_enqueue_script( 'bp-mentions', buddypress()->plugin_url . "bp-activity/js/mentions{$min}.js", array( 'jquery', 'jquery-atwho' ), bp_get_version(), true );
-	wp_enqueue_style( 'bp-mentions-css', buddypress()->plugin_url . "bp-activity/css/mentions{$min}.css", array(), bp_get_version() );
+	wp_enqueue_style( 'bp-mentions-css', buddypress()->plugin_url . "bp-activity/css/mentions{$rtl}{$min}.css", array(), bp_get_version() );
 
-	wp_style_add_data( 'bp-mentions-css', 'rtl', true );
 	if ( $min ) {
 		wp_style_add_data( 'bp-mentions-css', 'suffix', $min );
 	}
diff --git src/bp-core/bp-core-cssjs.php src/bp-core/bp-core-cssjs.php
index 6f5cd4a23..e3a87ef33 100644
--- src/bp-core/bp-core-cssjs.php
+++ src/bp-core/bp-core-cssjs.php
@@ -125,6 +125,7 @@ add_action( 'bp_admin_enqueue_scripts', 'bp_core_register_common_scripts', 1 );
 function bp_core_register_common_styles() {
 	$min = bp_core_get_minified_asset_suffix();
 	$url = buddypress()->plugin_url . 'bp-core/css/';
+	$rtl = is_rtl() ? '-rtl' : '';
 
 	/**
 	 * Filters the URL for the Admin Bar stylesheet.
@@ -133,7 +134,7 @@ function bp_core_register_common_styles() {
 	 *
 	 * @param string $value URL for the Admin Bar stylesheet.
 	 */
-	$admin_bar_file = apply_filters( 'bp_core_admin_bar_css', "{$url}admin-bar{$min}.css" );
+	$admin_bar_file = apply_filters( 'bp_core_admin_bar_css', "{$url}admin-bar{$rtl}{$min}.css" );
 
 	/**
 	 * Filters the BuddyPress Core stylesheet files to register.
@@ -148,7 +149,7 @@ function bp_core_register_common_styles() {
 			'dependencies' => array( 'admin-bar' )
 		),
 		'bp-avatar' => array(
-			'file'         => "{$url}avatar{$min}.css",
+			'file'         => "{$url}avatar{$rtl}{$min}.css",
 			'dependencies' => array( 'jcrop' )
 		),
 	) );
@@ -156,7 +157,6 @@ function bp_core_register_common_styles() {
 	foreach ( $styles as $id => $style ) {
 		wp_register_style( $id, $style['file'], $style['dependencies'], bp_get_version() );
 
-		wp_style_add_data( $id, 'rtl', true );
 		if ( $min ) {
 			wp_style_add_data( $id, 'suffix', $min );
 		}
diff --git src/bp-core/classes/class-bp-admin.php src/bp-core/classes/class-bp-admin.php
index 7149b5b9a..661c7978a 100644
--- src/bp-core/classes/class-bp-admin.php
+++ src/bp-core/classes/class-bp-admin.php
@@ -1064,6 +1064,7 @@ class BP_Admin {
 	public function admin_register_styles() {
 		$min = bp_core_get_minified_asset_suffix();
 		$url = $this->css_url;
+		$rtl = is_rtl() ? '-rtl' : '';
 
 		/**
 		 * Filters the BuddyPress Core Admin CSS file path.
@@ -1072,7 +1073,7 @@ class BP_Admin {
 		 *
 		 * @param string $file File path for the admin CSS.
 		 */
-		$common_css = apply_filters( 'bp_core_admin_common_css', "{$url}common{$min}.css" );
+		$common_css = apply_filters( 'bp_core_admin_common_css', "{$url}common{$rtl}{$min}.css" );
 
 		/**
 		 * Filters the BuddyPress admin stylesheet files to register.
@@ -1090,13 +1091,13 @@ class BP_Admin {
 
 			// 2.5
 			'bp-customizer-controls' => array(
-				'file'         => "{$url}customizer-controls{$min}.css",
+				'file'         => "{$url}customizer-controls{$rtl}{$min}.css",
 				'dependencies' => array(),
 			),
 
 			// 3.0
 			'bp-hello-css' => array(
-				'file'         => "{$url}hello{$min}.css",
+				'file'         => "{$url}hello{$rtl}{$min}.css",
 				'dependencies' => array( 'bp-admin-common-css' ),
 			),
 		) );
@@ -1105,7 +1106,6 @@ class BP_Admin {
 
 		foreach ( $styles as $id => $style ) {
 			wp_register_style( $id, $style['file'], $style['dependencies'], $version );
-			wp_style_add_data( $id, 'rtl', true );
 
 			if ( $min ) {
 				wp_style_add_data( $id, 'suffix', $min );
diff --git src/bp-core/deprecated/2.1.php src/bp-core/deprecated/2.1.php
index e69db465f..494cc9c4f 100644
--- src/bp-core/deprecated/2.1.php
+++ src/bp-core/deprecated/2.1.php
@@ -325,16 +325,16 @@ function bp_core_load_buddybar_css() {
 	}
 
 	$min = bp_core_get_minified_asset_suffix();
+	$rtl = is_rtl() ? '-rtl' : '';
 
 	if ( file_exists( get_stylesheet_directory() . '/_inc/css/adminbar.css' ) ) { // Backwards compatibility
 		$stylesheet = get_stylesheet_directory_uri() . '/_inc/css/adminbar.css';
 	} else {
-		$stylesheet = buddypress()->plugin_url . "bp-core/css/buddybar{$min}.css";
+		$stylesheet = buddypress()->plugin_url . "bp-core/css/buddybar{$rtl}{$min}.css";
 	}
 
 	wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_buddybar_rtl_css', $stylesheet ), array(), bp_get_version() );
 
-	wp_style_add_data( 'bp-admin-bar', 'rtl', true );
 	if ( $min ) {
 		wp_style_add_data( 'bp-admin-bar', 'suffix', $min );
 	}
diff --git src/bp-groups/bp-groups-admin.php src/bp-groups/bp-groups-admin.php
index 94ef62829..fbcd9ce86 100644
--- src/bp-groups/bp-groups-admin.php
+++ src/bp-groups/bp-groups-admin.php
@@ -76,8 +76,9 @@ function bp_groups_admin_load() {
 	// Build redirection URL.
 	$redirect_to = remove_query_arg( array( 'action', 'action2', 'gid', 'deleted', 'error', 'updated', 'success_new', 'error_new', 'success_modified', 'error_modified' ), $_SERVER['REQUEST_URI'] );
 
-	$doaction   = bp_admin_list_table_current_bulk_action();
-	$min        = bp_core_get_minified_asset_suffix();
+	$doaction = bp_admin_list_table_current_bulk_action();
+	$min      = bp_core_get_minified_asset_suffix();
+	$rtl      = is_rtl() ? '-rtl' : '';
 
 	/**
 	 * Fires at top of groups admin page.
@@ -200,9 +201,8 @@ function bp_groups_admin_load() {
 		'add_member_placeholder' => __( 'Start typing a username to add a new member.', 'buddypress' ),
 		'warn_on_leave'          => __( 'If you leave this page, you will lose any unsaved changes you have made to the group.', 'buddypress' ),
 	) );
-	wp_enqueue_style( 'bp_groups_admin_css', $bp->plugin_url . "bp-groups/admin/css/admin{$min}.css", array(), bp_get_version() );
+	wp_enqueue_style( 'bp_groups_admin_css', $bp->plugin_url . "bp-groups/admin/css/admin{$rtl}{$min}.css", array(), bp_get_version() );
 
-	wp_style_add_data( 'bp_groups_admin_css', 'rtl', true );
 	if ( $min ) {
 		wp_style_add_data( 'bp_groups_admin_css', 'suffix', $min );
 	}
diff --git src/bp-members/classes/class-bp-members-admin.php src/bp-members/classes/class-bp-members-admin.php
index fe410e5be..e41e738ab 100644
--- src/bp-members/classes/class-bp-members-admin.php
+++ src/bp-members/classes/class-bp-members-admin.php
@@ -611,7 +611,8 @@ class BP_Members_Admin {
 		}
 
 		$min = bp_core_get_minified_asset_suffix();
-		$css = $this->css_url . "admin{$min}.css";
+		$rtl = is_rtl() ? '-rtl' : '';
+		$css = $this->css_url . "admin{$rtl}{$min}.css";
 
 		/**
 		 * Filters the CSS URL to enqueue in the Members admin area.
@@ -624,7 +625,6 @@ class BP_Members_Admin {
 
 		wp_enqueue_style( 'bp-members-css', $css, array(), bp_get_version() );
 
-		wp_style_add_data( 'bp-members-css', 'rtl', true );
 		if ( $min ) {
 			wp_style_add_data( 'bp-members-css', 'suffix', $min );
 		}
diff --git src/bp-messages/bp-messages-cssjs.php src/bp-messages/bp-messages-cssjs.php
index f061916cc..4594a2129 100644
--- src/bp-messages/bp-messages-cssjs.php
+++ src/bp-messages/bp-messages-cssjs.php
@@ -39,10 +39,11 @@ function messages_add_autocomplete_css() {
 	if ( bp_is_messages_component() && bp_is_current_action( 'compose' ) ) {
 		$min = bp_core_get_minified_asset_suffix();
 		$url = buddypress()->plugin_url . 'bp-messages/css/';
+		$rtl = is_rtl() ? '-rtl' : '';
 
-		wp_enqueue_style( 'bp-messages-autocomplete', "{$url}autocomplete/jquery.autocompletefb{$min}.css", array(), bp_get_version() );
 
-		wp_style_add_data( 'bp-messages-autocomplete', 'rtl', true );
+		wp_enqueue_style( 'bp-messages-autocomplete', "{$url}autocomplete/jquery.autocompletefb{$rtl}{$min}.css", array(), bp_get_version() );
+
 		if ( $min ) {
 			wp_style_add_data( 'bp-messages-autocomplete', 'suffix', $min );
 		}
diff --git src/bp-xprofile/bp-xprofile-cssjs.php src/bp-xprofile/bp-xprofile-cssjs.php
index 419f5c72f..7cb9102e8 100644
--- src/bp-xprofile/bp-xprofile-cssjs.php
+++ src/bp-xprofile/bp-xprofile-cssjs.php
@@ -18,10 +18,10 @@ defined( 'ABSPATH' ) || exit;
 function xprofile_add_admin_css() {
 	if ( !empty( $_GET['page'] ) && strpos( $_GET['page'], 'bp-profile-setup' ) !== false ) {
 		$min = bp_core_get_minified_asset_suffix();
+		$rtl = is_rtl() ? '-rtl' : '';
 
-		wp_enqueue_style( 'xprofile-admin-css', buddypress()->plugin_url . "bp-xprofile/admin/css/admin{$min}.css", array(), bp_get_version() );
+		wp_enqueue_style( 'xprofile-admin-css', buddypress()->plugin_url . "bp-xprofile/admin/css/admin{$rtl}{$min}.css", array(), bp_get_version() );
 
-		wp_style_add_data( 'xprofile-admin-css', 'rtl', true );
 		if ( $min ) {
 			wp_style_add_data( 'xprofile-admin-css', 'suffix', $min );
 		}