diff --git src/bp-templates/bp-nouveau/css/twentytwentyone-rtl.css src/bp-templates/bp-nouveau/css/twentytwentyone-rtl.css
index dd782427c..cb7e20d45 100644
--- src/bp-templates/bp-nouveau/css/twentytwentyone-rtl.css
+++ src/bp-templates/bp-nouveau/css/twentytwentyone-rtl.css
@@ -445,10 +445,6 @@ body.activity-permalink #buddypress.twentytwentyone .activity-list .activity-ava
 * @section 4.1 - Groups Creation Steps
 *----------------------------------------------------------
 */
-#buddypress.twentytwentyone #group-create-body #avatar-crop-pane {
-	margin-bottom: 1em;
-}
-
 #buddypress.twentytwentyone #group-create-body nav.group-create-links:not(.tabbed-links) {
 	background: transparent;
 	clear: both;
@@ -532,6 +528,57 @@ body.activity-permalink #buddypress.twentytwentyone .activity-list .activity-ava
 	letter-spacing: var(--heading--letter-spacing-h4);
 }
 
+#buddypress.twentytwentyone .item-body .bp-avatar #avatar-crop-pane {
+	margin-bottom: 1em;
+}
+
+#buddypress.twentytwentyone .item-body .bp-avatar-nav ul.avatar-nav-items {
+	border-bottom: 1px solid var(--global--color-primary);
+}
+
+#buddypress.twentytwentyone .item-body .bp-avatar-nav ul.avatar-nav-items li.current {
+	border: 1px solid var(--global--color-primary);
+	border-bottom: 1px solid var(--global--color-background);
+}
+
+#buddypress.twentytwentyone .item-body #drag-drop-area {
+	border: 4px dashed var(--global--color-secondary);
+}
+
+#buddypress.twentytwentyone .item-body #drag-drop-area .drag-drop-info {
+	color: var(--global--color-secondary);
+}
+
+#buddypress.twentytwentyone .item-body #drag-drop-area #bp-browse-button {
+	margin: 50px auto 0;
+}
+
+#buddypress.twentytwentyone .item-body .bp-avatar-status .warning,
+#buddypress.twentytwentyone .item-body .bp-avatar-status .success,
+#buddypress.twentytwentyone .item-body .bp-cover-image-status .warning,
+#buddypress.twentytwentyone .item-body .bp-cover-image-status .success {
+	background-color: var(--global--color-light-gray);
+	border: none;
+	border-right-width: 4px;
+	border-right-style: solid;
+	color: var(--global--color-dark-gray);
+}
+
+#buddypress.twentytwentyone .item-body .bp-avatar-status .warning,
+#buddypress.twentytwentyone .item-body .bp-cover-image-status .warning {
+	border-right-color: var(--global--color-orange);
+}
+
+#buddypress.twentytwentyone .item-body .bp-avatar-status .success,
+#buddypress.twentytwentyone .item-body .bp-cover-image-status .success {
+	border-right-color: var(--global--color-green);
+}
+
+#buddypress.twentytwentyone .item-body .bp-avatar-status .error,
+#buddypress.twentytwentyone .item-body .bp-cover-image-status .error {
+	border-right-color: var(--global--color-red);
+}
+
 /**
 *----------------------------------------------------
 * @subsection 5.2.1 - Item Body Groups
@@ -736,53 +783,6 @@ body.activity-permalink #buddypress.twentytwentyone .activity-list .activity-ava
 	color: var(--global--color-secondary);
 }
 
-#buddypress.twentytwentyone .bp-avatar-nav ul.avatar-nav-items {
-	border-bottom: 1px solid var(--global--color-primary);
-}
-
-#buddypress.twentytwentyone .bp-avatar-nav ul.avatar-nav-items li.current {
-	border: 1px solid var(--global--color-primary);
-	border-bottom: 1px solid var(--global--color-background);
-}
-
-#buddypress.twentytwentyone #drag-drop-area {
-	border: 4px dashed var(--global--color-secondary);
-}
-
-#buddypress.twentytwentyone #drag-drop-area .drag-drop-info {
-	color: var(--global--color-secondary);
-}
-
-#buddypress.twentytwentyone #drag-drop-area #bp-browse-button {
-	margin: 50px auto 0;
-}
-
-#buddypress.twentytwentyone .bp-avatar-status .warning,
-#buddypress.twentytwentyone .bp-avatar-status .success,
-#buddypress.twentytwentyone .bp-cover-image-status .warning,
-#buddypress.twentytwentyone .bp-cover-image-status .success {
-	background-color: var(--global--color-light-gray);
-	border: none;
-	border-right-width: 4px;
-	border-right-style: solid;
-	color: var(--global--color-dark-gray);
-}
-
-#buddypress.twentytwentyone .bp-avatar-status .warning,
-#buddypress.twentytwentyone .bp-cover-image-status .warning {
-	border-right-color: var(--global--color-orange);
-}
-
-#buddypress.twentytwentyone .bp-avatar-status .success,
-#buddypress.twentytwentyone .bp-cover-image-status .success {
-	border-right-color: var(--global--color-green);
-}
-
-#buddypress.twentytwentyone .bp-avatar-status .error,
-#buddypress.twentytwentyone .bp-cover-image-status .error {
-	border-right-color: var(--global--color-red);
-}
-
 /**
 *-------------------------------------------
 * @subsection 5.2.2.3 - Groups
diff --git src/bp-templates/bp-nouveau/css/twentytwentyone.css src/bp-templates/bp-nouveau/css/twentytwentyone.css
index 871e0ab8d..4b88c6144 100644
--- src/bp-templates/bp-nouveau/css/twentytwentyone.css
+++ src/bp-templates/bp-nouveau/css/twentytwentyone.css
@@ -445,10 +445,6 @@ body.activity-permalink #buddypress.twentytwentyone .activity-list .activity-ava
 * @section 4.1 - Groups Creation Steps
 *----------------------------------------------------------
 */
-#buddypress.twentytwentyone #group-create-body #avatar-crop-pane {
-	margin-bottom: 1em;
-}
-
 #buddypress.twentytwentyone #group-create-body nav.group-create-links:not(.tabbed-links) {
 	background: transparent;
 	clear: both;
@@ -532,6 +528,57 @@ body.activity-permalink #buddypress.twentytwentyone .activity-list .activity-ava
 	letter-spacing: var(--heading--letter-spacing-h4);
 }
 
+#buddypress.twentytwentyone .item-body .bp-avatar #avatar-crop-pane {
+	margin-bottom: 1em;
+}
+
+#buddypress.twentytwentyone .item-body .bp-avatar-nav ul.avatar-nav-items {
+	border-bottom: 1px solid var(--global--color-primary);
+}
+
+#buddypress.twentytwentyone .item-body .bp-avatar-nav ul.avatar-nav-items li.current {
+	border: 1px solid var(--global--color-primary);
+	border-bottom: 1px solid var(--global--color-background);
+}
+
+#buddypress.twentytwentyone .item-body #drag-drop-area {
+	border: 4px dashed var(--global--color-secondary);
+}
+
+#buddypress.twentytwentyone .item-body #drag-drop-area .drag-drop-info {
+	color: var(--global--color-secondary);
+}
+
+#buddypress.twentytwentyone .item-body #drag-drop-area #bp-browse-button {
+	margin: 50px auto 0;
+}
+
+#buddypress.twentytwentyone .item-body .bp-avatar-status .warning,
+#buddypress.twentytwentyone .item-body .bp-avatar-status .success,
+#buddypress.twentytwentyone .item-body .bp-cover-image-status .warning,
+#buddypress.twentytwentyone .item-body .bp-cover-image-status .success {
+	background-color: var(--global--color-light-gray);
+	border: none;
+	border-left-width: 4px;
+	border-left-style: solid;
+	color: var(--global--color-dark-gray);
+}
+
+#buddypress.twentytwentyone .item-body .bp-avatar-status .warning,
+#buddypress.twentytwentyone .item-body .bp-cover-image-status .warning {
+	border-left-color: var(--global--color-orange);
+}
+
+#buddypress.twentytwentyone .item-body .bp-avatar-status .success,
+#buddypress.twentytwentyone .item-body .bp-cover-image-status .success {
+	border-left-color: var(--global--color-green);
+}
+
+#buddypress.twentytwentyone .item-body .bp-avatar-status .error,
+#buddypress.twentytwentyone .item-body .bp-cover-image-status .error {
+	border-left-color: var(--global--color-red);
+}
+
 /**
 *----------------------------------------------------
 * @subsection 5.2.1 - Item Body Groups
@@ -736,53 +783,6 @@ body.activity-permalink #buddypress.twentytwentyone .activity-list .activity-ava
 	color: var(--global--color-secondary);
 }
 
-#buddypress.twentytwentyone .bp-avatar-nav ul.avatar-nav-items {
-	border-bottom: 1px solid var(--global--color-primary);
-}
-
-#buddypress.twentytwentyone .bp-avatar-nav ul.avatar-nav-items li.current {
-	border: 1px solid var(--global--color-primary);
-	border-bottom: 1px solid var(--global--color-background);
-}
-
-#buddypress.twentytwentyone #drag-drop-area {
-	border: 4px dashed var(--global--color-secondary);
-}
-
-#buddypress.twentytwentyone #drag-drop-area .drag-drop-info {
-	color: var(--global--color-secondary);
-}
-
-#buddypress.twentytwentyone #drag-drop-area #bp-browse-button {
-	margin: 50px auto 0;
-}
-
-#buddypress.twentytwentyone .bp-avatar-status .warning,
-#buddypress.twentytwentyone .bp-avatar-status .success,
-#buddypress.twentytwentyone .bp-cover-image-status .warning,
-#buddypress.twentytwentyone .bp-cover-image-status .success {
-	background-color: var(--global--color-light-gray);
-	border: none;
-	border-left-width: 4px;
-	border-left-style: solid;
-	color: var(--global--color-dark-gray);
-}
-
-#buddypress.twentytwentyone .bp-avatar-status .warning,
-#buddypress.twentytwentyone .bp-cover-image-status .warning {
-	border-left-color: var(--global--color-orange);
-}
-
-#buddypress.twentytwentyone .bp-avatar-status .success,
-#buddypress.twentytwentyone .bp-cover-image-status .success {
-	border-left-color: var(--global--color-green);
-}
-
-#buddypress.twentytwentyone .bp-avatar-status .error,
-#buddypress.twentytwentyone .bp-cover-image-status .error {
-	border-left-color: var(--global--color-red);
-}
-
 /**
 *-------------------------------------------
 * @subsection 5.2.2.3 - Groups
diff --git src/bp-templates/bp-nouveau/sass/twentytwentyone.scss src/bp-templates/bp-nouveau/sass/twentytwentyone.scss
index 28d60bb19..b199aca50 100644
--- src/bp-templates/bp-nouveau/sass/twentytwentyone.scss
+++ src/bp-templates/bp-nouveau/sass/twentytwentyone.scss
@@ -619,10 +619,6 @@ body {
 
 	#group-create-body {
 
-		#avatar-crop-pane {
-			margin-bottom: 1em;
-		}
-
 		nav.group-create-links {
 
 			&:not(.tabbed-links) {
@@ -736,6 +732,65 @@ body {
 			font-size: var(--heading--font-size-h4);
 			letter-spacing: var(--heading--letter-spacing-h4);
 		}
+
+		.bp-avatar {
+
+			#avatar-crop-pane {
+				margin-bottom: 1em;
+			}
+		}
+
+		.bp-avatar-nav {
+
+			ul.avatar-nav-items {
+				border-bottom: 1px solid var(--global--color-primary);
+
+				li {
+
+					&.current {
+						border: 1px solid var(--global--color-primary);
+						border-bottom: 1px solid var(--global--color-background);
+					}
+				}
+			}
+		}
+
+		#drag-drop-area {
+			border: 4px dashed var(--global--color-secondary);
+
+			.drag-drop-info {
+				color: var(--global--color-secondary);
+			}
+
+			#bp-browse-button {
+				margin: 50px auto 0;
+			}
+		}
+
+		.bp-avatar-status,
+		.bp-cover-image-status {
+
+			.warning,
+			.success {
+				background-color: var(--global--color-light-gray);
+				border: none;
+				border-left-width: 4px;
+				border-left-style: solid;
+				color: var(--global--color-dark-gray);
+			}
+
+			.warning {
+				border-left-color: var(--global--color-orange);
+			}
+
+			.success {
+				border-left-color: var(--global--color-green);
+			}
+
+			.error {
+				border-left-color: var(--global--color-red);
+			}
+		}
 	}
 }
 
@@ -1005,58 +1060,6 @@ body {
 	.field-visibility-settings-header {
 		color: var(--global--color-secondary);
 	}
-
-	.bp-avatar-nav {
-
-		ul.avatar-nav-items {
-			border-bottom: 1px solid var(--global--color-primary);
-
-			li {
-
-				&.current {
-					border: 1px solid var(--global--color-primary);
-					border-bottom: 1px solid var(--global--color-background);
-				}
-			}
-		}
-	}
-
-	#drag-drop-area {
-		border: 4px dashed var(--global--color-secondary);
-
-		.drag-drop-info {
-			color: var(--global--color-secondary);
-		}
-
-		#bp-browse-button {
-			margin: 50px auto 0;
-		}
-	}
-
-	.bp-avatar-status,
-	.bp-cover-image-status {
-
-		.warning,
-		.success {
-			background-color: var(--global--color-light-gray);
-			border: none;
-			border-left-width: 4px;
-			border-left-style: solid;
-			color: var(--global--color-dark-gray);
-		}
-
-		.warning {
-			border-left-color: var(--global--color-orange);
-		}
-
-		.success {
-			border-left-color: var(--global--color-green);
-		}
-
-		.error {
-			border-left-color: var(--global--color-red);
-		}
-	}
 }
 
 /**