diff --git a/src/bp-templates/bp-nouveau/buddypress/common/nav/directory-nav.php b/src/bp-templates/bp-nouveau/buddypress/common/nav/directory-nav.php
index a9fb58d4a..0afd37aef 100644
--- a/src/bp-templates/bp-nouveau/buddypress/common/nav/directory-nav.php
+++ b/src/bp-templates/bp-nouveau/buddypress/common/nav/directory-nav.php
@@ -22,7 +22,7 @@
 						<?php bp_nouveau_nav_link_text(); ?>
 
 						<?php if ( bp_nouveau_nav_has_count() ) : ?>
-							<span><?php bp_nouveau_nav_count(); ?></span>
+							<span class="count"><?php bp_nouveau_nav_count(); ?></span>
 						<?php endif; ?>
 					</a>
 				</li>
diff --git a/src/bp-templates/bp-nouveau/buddypress/groups/create.php b/src/bp-templates/bp-nouveau/buddypress/groups/create.php
index b1469f989..546378b9d 100644
--- a/src/bp-templates/bp-nouveau/buddypress/groups/create.php
+++ b/src/bp-templates/bp-nouveau/buddypress/groups/create.php
@@ -20,7 +20,7 @@ bp_nouveau_groups_create_hook( 'before', 'page' ); ?>
 			<nav class="<?php bp_nouveau_groups_create_steps_classes(); ?>" id="group-create-tabs" role="navigation" aria-label="<?php esc_attr_e( 'Group creation menu', 'buddypress' ); ?>">
 				<ul class="group-create-buttons button-tabs">
 
-					<?php bp_nouveau_group_creation_tabs(); ?>
+					<?php bp_group_creation_tabs(); ?>
 
 				</ul>
 			</nav>
diff --git a/src/bp-templates/bp-nouveau/buddypress/groups/single/parts/admin-subnav.php b/src/bp-templates/bp-nouveau/buddypress/groups/single/parts/admin-subnav.php
index 546a121cf..fe3637c6e 100644
--- a/src/bp-templates/bp-nouveau/buddypress/groups/single/parts/admin-subnav.php
+++ b/src/bp-templates/bp-nouveau/buddypress/groups/single/parts/admin-subnav.php
@@ -22,7 +22,7 @@
 						<?php bp_nouveau_nav_link_text(); ?>
 
 						<?php if ( bp_nouveau_nav_has_count() ) : ?>
-							<span><?php bp_nouveau_nav_count(); ?></span>
+							<span class="count"><?php bp_nouveau_nav_count(); ?></span>
 						<?php endif; ?>
 					</a>
 				</li>
diff --git a/src/bp-templates/bp-nouveau/buddypress/groups/single/parts/item-nav.php b/src/bp-templates/bp-nouveau/buddypress/groups/single/parts/item-nav.php
index 60841afdb..ca0185c8b 100644
--- a/src/bp-templates/bp-nouveau/buddypress/groups/single/parts/item-nav.php
+++ b/src/bp-templates/bp-nouveau/buddypress/groups/single/parts/item-nav.php
@@ -22,7 +22,7 @@
 						<?php bp_nouveau_nav_link_text(); ?>
 
 						<?php if ( bp_nouveau_nav_has_count() ) : ?>
-							<span><?php bp_nouveau_nav_count(); ?></span>
+							<span class="count"><?php bp_nouveau_nav_count(); ?></span>
 						<?php endif; ?>
 					</a>
 				</li>
diff --git a/src/bp-templates/bp-nouveau/buddypress/members/single/parts/item-nav.php b/src/bp-templates/bp-nouveau/buddypress/members/single/parts/item-nav.php
index 20a57a9b6..a15924f15 100644
--- a/src/bp-templates/bp-nouveau/buddypress/members/single/parts/item-nav.php
+++ b/src/bp-templates/bp-nouveau/buddypress/members/single/parts/item-nav.php
@@ -22,7 +22,7 @@
 						<?php bp_nouveau_nav_link_text(); ?>
 
 						<?php if ( bp_nouveau_nav_has_count() ) : ?>
-							<span><?php bp_nouveau_nav_count(); ?></span>
+							<span class="count"><?php bp_nouveau_nav_count(); ?></span>
 						<?php endif; ?>
 					</a>
 				</li>
diff --git a/src/bp-templates/bp-nouveau/buddypress/members/single/parts/item-subnav.php b/src/bp-templates/bp-nouveau/buddypress/members/single/parts/item-subnav.php
index ca1aeecec..cf926e939 100644
--- a/src/bp-templates/bp-nouveau/buddypress/members/single/parts/item-subnav.php
+++ b/src/bp-templates/bp-nouveau/buddypress/members/single/parts/item-subnav.php
@@ -18,7 +18,7 @@
 				<?php bp_nouveau_nav_link_text(); ?>
 
 				<?php if ( bp_nouveau_nav_has_count() ) : ?>
-					<span><?php bp_nouveau_nav_count(); ?></span>
+					<span class="count"><?php bp_nouveau_nav_count(); ?></span>
 				<?php endif; ?>
 			</a>
 		</li>
diff --git a/src/bp-templates/bp-nouveau/common-styles/_bp-mixins.scss b/src/bp-templates/bp-nouveau/common-styles/_bp-mixins.scss
index f96ec08c0..dd1ba9f48 100644
--- a/src/bp-templates/bp-nouveau/common-styles/_bp-mixins.scss
+++ b/src/bp-templates/bp-nouveau/common-styles/_bp-mixins.scss
@@ -373,6 +373,7 @@
 				border-top-right-radius: 4px;
 				border-width: 1px;
 				margin-bottom: -1px;
+				margin-top: 1px;
 				padding: 0 $pad-sml;
 
 				a {
diff --git a/src/bp-templates/bp-nouveau/common-styles/_bp_navigation.scss b/src/bp-templates/bp-nouveau/common-styles/_bp_navigation.scss
index 179ada813..be6b39e0f 100644
--- a/src/bp-templates/bp-nouveau/common-styles/_bp_navigation.scss
+++ b/src/bp-templates/bp-nouveau/common-styles/_bp_navigation.scss
@@ -32,7 +32,7 @@
 				text-decoration: none;
 			}
 
-			span {
+			.count {
 				background: $light-grey;
 				border: 1px solid $bp-border-dark;
 				border-radius: 50%;
@@ -92,7 +92,7 @@
 
 			a {
 
-				span {
+				.count {
 					background-color: $grey;
 				}
 			}
@@ -117,7 +117,7 @@
 				background: $dark-grey;
 				color: $off-white;
 
-				span {
+				.count {
 					border-color: $off-white;
 				}
 			}
@@ -310,7 +310,7 @@
 
 			a {
 
-				span {
+				.count {
 					background-color: $white;
 				}
 			}
@@ -322,7 +322,7 @@
 
 			a {
 
-				span {
+				.count {
 					background-color: $highlight;
 					border: 0;
 					color: $off-white;
@@ -334,7 +334,7 @@
 
 			a:hover {
 
-				span {
+				.count {
 					background-color: $highlight;
 					border: 0;
 					color: $white;
@@ -346,7 +346,7 @@
 
 			a {
 
-				span:empty {
+				.count:empty {
 					display: none;
 				}
 			}
@@ -359,7 +359,7 @@
 		ul {
 
 			li:not(.current) {
-
+				color: $light-text;
 				a {
 					color: $light-text;
 
@@ -436,7 +436,7 @@
 
 			a {
 
-				span {
+				.count {
 					display: inline-block;
 					float: right;
 				}
@@ -458,7 +458,7 @@
 
 			a {
 
-				span {
+				.count {
 					float: right;
 
 				}
diff --git a/src/bp-templates/bp-nouveau/css/buddypress-rtl.css b/src/bp-templates/bp-nouveau/css/buddypress-rtl.css
index 0cf1e525a..e32a5bffd 100644
--- a/src/bp-templates/bp-nouveau/css/buddypress-rtl.css
+++ b/src/bp-templates/bp-nouveau/css/buddypress-rtl.css
@@ -302,7 +302,7 @@ body.buddypress article.page > .entry-header .entry-title {
 	text-decoration: none;
 }
 
-.bp-navs ul li span {
+.bp-navs ul li .count {
 	background: #eaeaea;
 	border: 1px solid #ccc;
 	border-radius: 50%;
@@ -330,9 +330,9 @@ body.buddypress article.page > .entry-header .entry-title {
 	margin-bottom: 20px;
 }
 
-.buddypress-wrap .bp-navs li.selected a span,
-.buddypress-wrap .bp-navs li.current a span,
-.buddypress-wrap .bp-navs li a:hover a span {
+.buddypress-wrap .bp-navs li.selected a .count,
+.buddypress-wrap .bp-navs li.current a .count,
+.buddypress-wrap .bp-navs li a:hover a .count {
 	background-color: #ccc;
 }
 
@@ -354,12 +354,12 @@ body.buddypress article.page > .entry-header .entry-title {
 	color: #fafafa;
 }
 
-.buddypress-wrap .bp-navs li.selected a span,
-.buddypress-wrap .bp-navs li.selected a:focus span,
-.buddypress-wrap .bp-navs li.selected a:hover span,
-.buddypress-wrap .bp-navs li.current a span,
-.buddypress-wrap .bp-navs li.current a:focus span,
-.buddypress-wrap .bp-navs li.current a:hover span {
+.buddypress-wrap .bp-navs li.selected a .count,
+.buddypress-wrap .bp-navs li.selected a:focus .count,
+.buddypress-wrap .bp-navs li.selected a:hover .count,
+.buddypress-wrap .bp-navs li.current a .count,
+.buddypress-wrap .bp-navs li.current a:focus .count,
+.buddypress-wrap .bp-navs li.current a:hover .count {
 	border-color: #fafafa;
 }
 
@@ -461,36 +461,41 @@ body.buddypress article.page > .entry-header .entry-title {
 	}
 }
 
-.buddypress_object_nav .bp-navs li.selected a span,
-.buddypress_object_nav .bp-navs li.current a span,
-.buddypress-wrap .bp-navs li.selected a span,
-.buddypress-wrap .bp-navs li.current a span {
+.buddypress_object_nav .bp-navs li.selected a .count,
+.buddypress_object_nav .bp-navs li.current a .count,
+.buddypress-wrap .bp-navs li.selected a .count,
+.buddypress-wrap .bp-navs li.current a .count {
 	background-color: #fff;
 }
 
-.buddypress_object_nav .bp-navs li.dynamic a span,
-.buddypress_object_nav .bp-navs li.dynamic.selected a span,
-.buddypress_object_nav .bp-navs li.dynamic.current a span,
-.buddypress-wrap .bp-navs li.dynamic a span,
-.buddypress-wrap .bp-navs li.dynamic.selected a span,
-.buddypress-wrap .bp-navs li.dynamic.current a span {
+.buddypress_object_nav .bp-navs li.dynamic a .count,
+.buddypress_object_nav .bp-navs li.dynamic.selected a .count,
+.buddypress_object_nav .bp-navs li.dynamic.current a .count,
+.buddypress-wrap .bp-navs li.dynamic a .count,
+.buddypress-wrap .bp-navs li.dynamic.selected a .count,
+.buddypress-wrap .bp-navs li.dynamic.current a .count {
 	background-color: #5087e5;
 	border: 0;
 	color: #fafafa;
 }
 
-.buddypress_object_nav .bp-navs li.dynamic a:hover span,
-.buddypress-wrap .bp-navs li.dynamic a:hover span {
+.buddypress_object_nav .bp-navs li.dynamic a:hover .count,
+.buddypress-wrap .bp-navs li.dynamic a:hover .count {
 	background-color: #5087e5;
 	border: 0;
 	color: #fff;
 }
 
-.buddypress_object_nav .bp-navs li a span:empty,
-.buddypress-wrap .bp-navs li a span:empty {
+.buddypress_object_nav .bp-navs li a .count:empty,
+.buddypress-wrap .bp-navs li a .count:empty {
 	display: none;
 }
 
+.buddypress_object_nav .bp-navs.group-create-links ul li:not(.current),
+.buddypress-wrap .bp-navs.group-create-links ul li:not(.current) {
+	color: #767676;
+}
+
 .buddypress_object_nav .bp-navs.group-create-links ul li:not(.current) a,
 .buddypress-wrap .bp-navs.group-create-links ul li:not(.current) a {
 	color: #767676;
@@ -532,7 +537,7 @@ body.buddypress article.page > .entry-header .entry-title {
 	}
 }
 
-.buddypress_object_nav .bp-navs li a span {
+.buddypress_object_nav .bp-navs li a .count {
 	display: inline-block;
 	float: left;
 }
@@ -541,7 +546,7 @@ body.buddypress article.page > .entry-header .entry-title {
 	.bp-dir-vert-nav .bp-navs.dir-navs {
 		background: none;
 	}
-	.bp-dir-vert-nav .bp-navs.dir-navs a span {
+	.bp-dir-vert-nav .bp-navs.dir-navs a .count {
 		float: left;
 	}
 }
@@ -577,6 +582,7 @@ body.buddypress article.page > .entry-header .entry-title {
 		border-top-left-radius: 4px;
 		border-width: 1px;
 		margin-bottom: -1px;
+		margin-top: 1px;
 		padding: 0 0.5em;
 	}
 	.buddypress-wrap .item-body .tabbed-links ul li.current a {
diff --git a/src/bp-templates/bp-nouveau/css/buddypress.css b/src/bp-templates/bp-nouveau/css/buddypress.css
index 2f846f4b0..fa1769d3a 100644
--- a/src/bp-templates/bp-nouveau/css/buddypress.css
+++ b/src/bp-templates/bp-nouveau/css/buddypress.css
@@ -302,7 +302,7 @@ body.buddypress article.page > .entry-header .entry-title {
 	text-decoration: none;
 }
 
-.bp-navs ul li span {
+.bp-navs ul li .count {
 	background: #eaeaea;
 	border: 1px solid #ccc;
 	border-radius: 50%;
@@ -330,9 +330,9 @@ body.buddypress article.page > .entry-header .entry-title {
 	margin-bottom: 20px;
 }
 
-.buddypress-wrap .bp-navs li.selected a span,
-.buddypress-wrap .bp-navs li.current a span,
-.buddypress-wrap .bp-navs li a:hover a span {
+.buddypress-wrap .bp-navs li.selected a .count,
+.buddypress-wrap .bp-navs li.current a .count,
+.buddypress-wrap .bp-navs li a:hover a .count {
 	background-color: #ccc;
 }
 
@@ -354,12 +354,12 @@ body.buddypress article.page > .entry-header .entry-title {
 	color: #fafafa;
 }
 
-.buddypress-wrap .bp-navs li.selected a span,
-.buddypress-wrap .bp-navs li.selected a:focus span,
-.buddypress-wrap .bp-navs li.selected a:hover span,
-.buddypress-wrap .bp-navs li.current a span,
-.buddypress-wrap .bp-navs li.current a:focus span,
-.buddypress-wrap .bp-navs li.current a:hover span {
+.buddypress-wrap .bp-navs li.selected a .count,
+.buddypress-wrap .bp-navs li.selected a:focus .count,
+.buddypress-wrap .bp-navs li.selected a:hover .count,
+.buddypress-wrap .bp-navs li.current a .count,
+.buddypress-wrap .bp-navs li.current a:focus .count,
+.buddypress-wrap .bp-navs li.current a:hover .count {
 	border-color: #fafafa;
 }
 
@@ -461,36 +461,41 @@ body.buddypress article.page > .entry-header .entry-title {
 	}
 }
 
-.buddypress_object_nav .bp-navs li.selected a span,
-.buddypress_object_nav .bp-navs li.current a span,
-.buddypress-wrap .bp-navs li.selected a span,
-.buddypress-wrap .bp-navs li.current a span {
+.buddypress_object_nav .bp-navs li.selected a .count,
+.buddypress_object_nav .bp-navs li.current a .count,
+.buddypress-wrap .bp-navs li.selected a .count,
+.buddypress-wrap .bp-navs li.current a .count {
 	background-color: #fff;
 }
 
-.buddypress_object_nav .bp-navs li.dynamic a span,
-.buddypress_object_nav .bp-navs li.dynamic.selected a span,
-.buddypress_object_nav .bp-navs li.dynamic.current a span,
-.buddypress-wrap .bp-navs li.dynamic a span,
-.buddypress-wrap .bp-navs li.dynamic.selected a span,
-.buddypress-wrap .bp-navs li.dynamic.current a span {
+.buddypress_object_nav .bp-navs li.dynamic a .count,
+.buddypress_object_nav .bp-navs li.dynamic.selected a .count,
+.buddypress_object_nav .bp-navs li.dynamic.current a .count,
+.buddypress-wrap .bp-navs li.dynamic a .count,
+.buddypress-wrap .bp-navs li.dynamic.selected a .count,
+.buddypress-wrap .bp-navs li.dynamic.current a .count {
 	background-color: #5087e5;
 	border: 0;
 	color: #fafafa;
 }
 
-.buddypress_object_nav .bp-navs li.dynamic a:hover span,
-.buddypress-wrap .bp-navs li.dynamic a:hover span {
+.buddypress_object_nav .bp-navs li.dynamic a:hover .count,
+.buddypress-wrap .bp-navs li.dynamic a:hover .count {
 	background-color: #5087e5;
 	border: 0;
 	color: #fff;
 }
 
-.buddypress_object_nav .bp-navs li a span:empty,
-.buddypress-wrap .bp-navs li a span:empty {
+.buddypress_object_nav .bp-navs li a .count:empty,
+.buddypress-wrap .bp-navs li a .count:empty {
 	display: none;
 }
 
+.buddypress_object_nav .bp-navs.group-create-links ul li:not(.current),
+.buddypress-wrap .bp-navs.group-create-links ul li:not(.current) {
+	color: #767676;
+}
+
 .buddypress_object_nav .bp-navs.group-create-links ul li:not(.current) a,
 .buddypress-wrap .bp-navs.group-create-links ul li:not(.current) a {
 	color: #767676;
@@ -532,7 +537,7 @@ body.buddypress article.page > .entry-header .entry-title {
 	}
 }
 
-.buddypress_object_nav .bp-navs li a span {
+.buddypress_object_nav .bp-navs li a .count {
 	display: inline-block;
 	float: right;
 }
@@ -541,7 +546,7 @@ body.buddypress article.page > .entry-header .entry-title {
 	.bp-dir-vert-nav .bp-navs.dir-navs {
 		background: none;
 	}
-	.bp-dir-vert-nav .bp-navs.dir-navs a span {
+	.bp-dir-vert-nav .bp-navs.dir-navs a .count {
 		float: right;
 	}
 }
@@ -577,6 +582,7 @@ body.buddypress article.page > .entry-header .entry-title {
 		border-top-right-radius: 4px;
 		border-width: 1px;
 		margin-bottom: -1px;
+		margin-top: 1px;
 		padding: 0 0.5em;
 	}
 	.buddypress-wrap .item-body .tabbed-links ul li.current a {