diff --git Gruntfile.js Gruntfile.js
index e7a348f6d..274d48853 100644
--- Gruntfile.js
+++ Gruntfile.js
@@ -51,8 +51,7 @@ module.exports = function( grunt ) {
 			'!bp-groups/css/blocks/dynamic-groups.css',
 			'!bp-messages/css/blocks/sitewide-notices.css',
 			'!bp-blogs/css/blocks/recent-posts.css',
-			'!bp-members/css/blocks/active-members.css',
-			'!bp-members/css/blocks/online-members.css'
+			'!bp-members/css/blocks/member-avatar-blocks.css'
 		],
 
 		autoprefixer = require('autoprefixer');
@@ -216,7 +215,7 @@ module.exports = function( grunt ) {
 					autoRename: false,
 					clean: true
 				},
-				saveUnmodified: false
+				saveUnmodified: true
 			},
 			core: {
 				expand: true,
diff --git src/bp-members/classes/class-bp-members-component.php src/bp-members/classes/class-bp-members-component.php
index aa27c337b..a7096bec9 100644
--- src/bp-members/classes/class-bp-members-component.php
+++ src/bp-members/classes/class-bp-members-component.php
@@ -880,8 +880,8 @@ class BP_Members_Component extends BP_Component {
 						'wp-block-editor',
 						'bp-block-components',
 					),
-					'editor_style'       => 'bp-online-members-block',
-					'editor_style_url'   => plugins_url( 'css/blocks/online-members.css', dirname( __FILE__ ) ),
+					'editor_style'       => 'bp-member-avatar-blocks',
+					'editor_style_url'   => plugins_url( 'css/blocks/member-avatar-blocks.css', dirname( __FILE__ ) ),
 					'attributes'         => array(
 						'title'      => array(
 							'type'    => 'string',
@@ -906,8 +906,8 @@ class BP_Members_Component extends BP_Component {
 						'wp-block-editor',
 						'bp-block-components',
 					),
-					'editor_style'       => 'bp-active-members-block',
-					'editor_style_url'   => plugins_url( 'css/blocks/active-members.css', dirname( __FILE__ ) ),
+					'editor_style'       => 'bp-member-avatar-blocks',
+					'editor_style_url'   => plugins_url( 'css/blocks/member-avatar-blocks.css', dirname( __FILE__ ) ),
 					'attributes'         => array(
 						'title'      => array(
 							'type'    => 'string',
diff --git src/bp-members/css/blocks/active-members.css src/bp-members/css/blocks/active-members.css
deleted file mode 100644
index ccf5bf1b9..000000000
--- src/bp-members/css/blocks/active-members.css
+++ /dev/null
@@ -1,8 +0,0 @@
-[data-type="bp/active-members"] .avatar-block {
-	display: flex;
-	flex-flow: row wrap;
-}
-
-[data-type="bp/active-members"] .avatar-block img {
-	margin: 0.5em;
-}
diff --git src/bp-members/css/blocks/online-members.css src/bp-members/css/blocks/member-avatar-blocks-rtl.css
similarity index 61%
rename from src/bp-members/css/blocks/online-members.css
rename to src/bp-members/css/blocks/member-avatar-blocks-rtl.css
index 44cc4783e..52eedcdc3 100644
--- src/bp-members/css/blocks/online-members.css
+++ src/bp-members/css/blocks/member-avatar-blocks-rtl.css
@@ -1,8 +1,10 @@
+[data-type="bp/active-members"] .avatar-block,
 [data-type="bp/online-members"] .avatar-block {
 	display: flex;
 	flex-flow: row wrap;
 }
 
+[data-type="bp/active-members"] .avatar-block img,
 [data-type="bp/online-members"] .avatar-block img {
 	margin: 0.5em;
 }
diff --git src/bp-members/css/blocks/member-avatar-blocks.css src/bp-members/css/blocks/member-avatar-blocks.css
new file mode 100644
index 000000000..52eedcdc3
--- /dev/null
+++ src/bp-members/css/blocks/member-avatar-blocks.css
@@ -0,0 +1,10 @@
+[data-type="bp/active-members"] .avatar-block,
+[data-type="bp/online-members"] .avatar-block {
+	display: flex;
+	flex-flow: row wrap;
+}
+
+[data-type="bp/active-members"] .avatar-block img,
+[data-type="bp/online-members"] .avatar-block img {
+	margin: 0.5em;
+}
diff --git src/bp-members/sass/blocks/active-members.scss src/bp-members/sass/blocks/active-members.scss
deleted file mode 100644
index f8c031ba9..000000000
--- src/bp-members/sass/blocks/active-members.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-// BP Who's online widget
-[data-type="bp/active-members"] {
-
-	.avatar-block {
-		display: flex;
-		flex-flow: row wrap;
-
-		img {
-			margin: 0.5em;
-		}
-	}
-}
diff --git src/bp-members/sass/blocks/online-members.scss src/bp-members/sass/blocks/member-avatar-blocks.scss
similarity index 62%
rename from src/bp-members/sass/blocks/online-members.scss
rename to src/bp-members/sass/blocks/member-avatar-blocks.scss
index 913b90c16..3854924ce 100644
--- src/bp-members/sass/blocks/online-members.scss
+++ src/bp-members/sass/blocks/member-avatar-blocks.scss
@@ -1,4 +1,5 @@
-// BP Who's online widget
+// BP Who's online & active members blocks.
+[data-type="bp/active-members"],
 [data-type="bp/online-members"] {
 
 	.avatar-block {