Index: bp-themes/bp-default/groups/index.php
===================================================================
--- bp-themes/bp-default/groups/index.php	(revision 4658)
+++ bp-themes/bp-default/groups/index.php	(working copy)
@@ -30,11 +30,11 @@
 
 			<div class="item-list-tabs" role="navigation">
 				<ul>
-					<li class="selected" id="groups-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() ); ?>"><?php printf( __( 'All Groups (%s)', 'buddypress' ), bp_get_total_group_count() ); ?></a></li>
+					<li class="selected" id="groups-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() ); ?>"><?php printf( __( 'All Groups <span>%s</span>', 'buddypress' ), bp_get_total_group_count() ); ?></a></li>
 
 					<?php if ( is_user_logged_in() && bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>
 
-						<li id="groups-personal"><a href="<?php echo trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() . '/my-groups' ); ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
+						<li id="groups-personal"><a href="<?php echo trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() . '/my-groups' ); ?>"><?php printf( __( 'My Groups <span>%s</span>', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
 
 					<?php endif; ?>
 
Index: bp-themes/bp-default/members/index.php
===================================================================
--- bp-themes/bp-default/members/index.php	(revision 4658)
+++ bp-themes/bp-default/members/index.php	(working copy)
@@ -28,11 +28,11 @@
 
 			<div class="item-list-tabs" role="navigation">
 				<ul>
-					<li class="selected" id="members-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() ); ?>"><?php printf( __( 'All Members (%s)', 'buddypress' ), bp_get_total_member_count() ); ?></a></li>
+					<li class="selected" id="members-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() ); ?>"><?php printf( __( 'All Members <span>%s</span>', 'buddypress' ), bp_get_total_member_count() ); ?></a></li>
 
 					<?php if ( is_user_logged_in() && bp_is_active( 'friends' ) && bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
 
-						<li id="members-personal"><a href="<?php echo bp_loggedin_user_domain() . bp_get_friends_slug() . '/my-friends/' ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ); ?></a></li>
+						<li id="members-personal"><a href="<?php echo bp_loggedin_user_domain() . bp_get_friends_slug() . '/my-friends/' ?>"><?php printf( __( 'My Friends <span>%s</span>', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ); ?></a></li>
 
 					<?php endif; ?>
 
Index: bp-themes/bp-default/activity/index.php
===================================================================
--- bp-themes/bp-default/activity/index.php	(revision 4658)
+++ bp-themes/bp-default/activity/index.php	(working copy)
@@ -34,7 +34,7 @@
 				<ul>
 					<?php do_action( 'bp_before_activity_type_tab_all' ) ?>
 
-					<li class="selected" id="activity-all"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' ?>" title="<?php _e( 'The public activity for everyone on this site.', 'buddypress' ) ?>"><?php printf( __( 'All Members (%s)', 'buddypress' ), bp_get_total_site_member_count() ) ?></a></li>
+					<li class="selected" id="activity-all"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' ?>" title="<?php _e( 'The public activity for everyone on this site.', 'buddypress' ) ?>"><?php printf( __( 'All Members <span>%s</span>', 'buddypress' ), bp_get_total_site_member_count() ) ?></a></li>
 
 					<?php if ( is_user_logged_in() ) : ?>
 
@@ -44,7 +44,7 @@
 
 							<?php if ( bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
 
-								<li id="activity-friends"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_friends_slug() . '/' ?>" title="<?php _e( 'The activity of my friends only.', 'buddypress' ) ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
+								<li id="activity-friends"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_friends_slug() . '/' ?>" title="<?php _e( 'The activity of my friends only.', 'buddypress' ) ?>"><?php printf( __( 'My Friends <span>%s</span>', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
 
 							<?php endif; ?>
 
@@ -56,7 +56,7 @@
 
 							<?php if ( bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>
 
-								<li id="activity-groups"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_groups_slug() . '/' ?>" title="<?php _e( 'The activity of groups I am a member of.', 'buddypress' ) ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
+								<li id="activity-groups"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_groups_slug() . '/' ?>" title="<?php _e( 'The activity of groups I am a member of.', 'buddypress' ) ?>"><?php printf( __( 'My Groups <span>%s</span>', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
 
 							<?php endif; ?>
 
@@ -66,13 +66,13 @@
 
 						<?php if ( bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) : ?>
 
-							<li id="activity-favorites"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/favorites/' ?>" title="<?php _e( "The activity I've marked as a favorite.", 'buddypress' ) ?>"><?php printf( __( 'My Favorites (<span>%s</span>)', 'buddypress' ), bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
+							<li id="activity-favorites"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/favorites/' ?>" title="<?php _e( "The activity I've marked as a favorite.", 'buddypress' ) ?>"><?php printf( __( 'My Favorites <span>%s</span>', 'buddypress' ), bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
 
 						<?php endif; ?>
 
 						<?php do_action( 'bp_before_activity_type_tab_mentions' ) ?>
 
-						<li id="activity-mentions"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/mentions/' ?>" title="<?php _e( 'Activity that I have been mentioned in.', 'buddypress' ) ?>"><?php _e( 'Public Mentions', 'buddypress' ); ?><?php if ( bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) : ?> <strong><?php printf( __( '(%s new)', 'buddypress' ), bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) ?></strong><?php endif; ?></a></li>
+						<li id="activity-mentions"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/mentions/' ?>" title="<?php _e( 'Activity that I have been mentioned in.', 'buddypress' ) ?>"><?php _e( 'Public Mentions', 'buddypress' ); ?><?php if ( bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) : ?> <strong><?php printf( __( '<span>%s new</span>', 'buddypress' ), bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) ?></strong><?php endif; ?></a></li>
 
 					<?php endif; ?>
 
Index: bp-themes/bp-default/blogs/index.php
===================================================================
--- bp-themes/bp-default/blogs/index.php	(revision 4658)
+++ bp-themes/bp-default/blogs/index.php	(working copy)
@@ -28,11 +28,11 @@
 
 			<div class="item-list-tabs" role="navigation">
 				<ul>
-					<li class="selected" id="blogs-all"><a href="<?php bp_root_domain(); ?>"><?php printf( __( 'All Sites (%s)', 'buddypress' ), bp_get_total_blog_count() ); ?></a></li>
+					<li class="selected" id="blogs-all"><a href="<?php bp_root_domain(); ?>"><?php printf( __( 'All Sites <span>%s</span>', 'buddypress' ), bp_get_total_blog_count() ); ?></a></li>
 
 					<?php if ( is_user_logged_in() && bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) : ?>
 
-						<li id="blogs-personal"><a href="<?php echo bp_loggedin_user_domain() . bp_get_blogs_slug() . '/my-blogs/' ?>"><?php printf( __( 'My Sites (%s)', 'buddypress' ), bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
+						<li id="blogs-personal"><a href="<?php echo bp_loggedin_user_domain() . bp_get_blogs_slug() . '/my-blogs/' ?>"><?php printf( __( 'My Sites <span>%s</span>', 'buddypress' ), bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
 
 					<?php endif; ?>
 
Index: bp-themes/bp-default/_inc/css/default.css
===================================================================
--- bp-themes/bp-default/_inc/css/default.css	(revision 4658)
+++ bp-themes/bp-default/_inc/css/default.css	(working copy)
@@ -1315,6 +1315,16 @@
 	padding: 3px 8px;
 	text-decoration: none;
 }
+a.bp-primary-action span, .comment-reply-link span, #reply-title small a span {
+	background: #FFA200;
+    -moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+    color: #FFF;
+    margin-left: 2px;
+    padding: 0 5px;
+    font-size: 90%; 
+}
 a.bp-primary-action:hover,
 .comment-reply-link:hover,
 #reply-title small a:hover {
@@ -1322,6 +1332,12 @@
 	border-color: #f7740a;
 	color: #fff;
 }
+a.bp-primary-action:hover span,
+.comment-reply-link:hover span,
+#reply-title small a:hover span {
+	background: #fff;
+	color: #f7740a;
+}
 div.activity-comments {
 	margin: 0 0 0 70px;
 	overflow: hidden; /* IE fix */
@@ -2116,9 +2132,16 @@
 	color: #aaa;
 }
 div.item-list-tabs ul li a span {
-	color: inherit;
+	color: #fff;
 	display: inline;
-	padding: 0;
+	padding:  0 6px;
+	background: #1FB3DD; 
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+    margin-left: 2px;
+    font-size: 90%; 
+    line-height: 100%; 
 }
 div.item-list-tabs ul li.selected a,
 div.item-list-tabs ul li.current a {
@@ -2132,6 +2155,10 @@
 	color: #555;
 	font-weight: bold;
 }
+div.item-list-tabs ul li.selected a span,
+div.item-list-tabs ul li.current a span {
+	background: #999;
+}
 ul li.loading a {
 	background-image: url( ../images/ajax-loader.gif );
 	background-position: 92% 50%;
Index: bp-themes/bp-default/forums/index.php
===================================================================
--- bp-themes/bp-default/forums/index.php	(revision 4658)
+++ bp-themes/bp-default/forums/index.php	(working copy)
@@ -35,11 +35,11 @@
 
 				<div class="item-list-tabs" role="navigation">
 					<ul>
-						<li class="selected" id="forums-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_forums_root_slug() ); ?>"><?php printf( __( 'All Topics (%s)', 'buddypress' ), bp_get_forum_topic_count() ); ?></a></li>
+						<li class="selected" id="forums-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_forums_root_slug() ); ?>"><?php printf( __( 'All Topics <span>%s</span>', 'buddypress' ), bp_get_forum_topic_count() ); ?></a></li>
 
 						<?php if ( is_user_logged_in() && bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ) : ?>
 
-							<li id="forums-personal"><a href="<?php echo trailingslashit( bp_loggedin_user_domain() . bp_get_forums_slug() . '/topics' ); ?>"><?php printf( __( 'My Topics (%s)', 'buddypress' ), bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
+							<li id="forums-personal"><a href="<?php echo trailingslashit( bp_loggedin_user_domain() . bp_get_forums_slug() . '/topics' ); ?>"><?php printf( __( 'My Topics <span>%s</span>', 'buddypress' ), bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
 
 						<?php endif; ?>
 
Index: bp-friends/bp-friends-loader.php
===================================================================
--- bp-friends/bp-friends-loader.php	(revision 4658)
+++ bp-friends/bp-friends-loader.php	(working copy)
@@ -94,7 +94,7 @@
 
 		// Add 'Friends' to the main navigation
 		$main_nav = array(
-			'name'                => sprintf( __( 'Friends <span>(%d)</span>', 'buddypress' ), friends_get_total_friend_count() ),
+			'name'                => sprintf( __( 'Friends <span>%d</span>', 'buddypress' ), friends_get_total_friend_count() ),
 			'slug'                => $this->slug,
 			'position'            => 60,
 			'screen_function'     => 'friends_screen_my_friends',
@@ -148,8 +148,8 @@
 
 			// Pending friend requests
 			if ( $count = count( friends_get_friendship_request_user_ids( $bp->loggedin_user->id ) ) ) {
-				$title   = sprintf( __( 'Friends <strong>(%s)</strong>',          'buddypress' ), $count );
-				$pending = sprintf( __( 'Pending Requests <strong>(%s)</strong>', 'buddypress' ), $count );
+				$title   = sprintf( __( 'Friends <span>%s</span>',          'buddypress' ), $count );
+				$pending = sprintf( __( 'Pending Requests <span>%s</span>', 'buddypress' ), $count );
 			} else {
 				$title   = __( 'Friends',             'buddypress' );
 				$pending = __( 'No Pending Requests', 'buddypress' );
Index: bp-activity/bp-activity-template.php
===================================================================
--- bp-activity/bp-activity-template.php	(revision 4658)
+++ bp-activity/bp-activity-template.php	(working copy)
@@ -712,7 +712,7 @@
 			$content .= $time_since;
 
 		if ( is_user_logged_in() && bp_activity_can_comment() )
-			$content .= sprintf( '<a href="%1$s" class="acomment-reply bp-primary-action" id="acomment-comment-%2$d">%3$s</a>', bp_get_activity_comment_link(), bp_get_activity_id(), sprintf( __( 'Reply (<span>%s</span>)', 'buddypress' ), bp_activity_get_comment_count() ) );
+			$content .= sprintf( '<a href="%1$s" class="acomment-reply bp-primary-action" id="acomment-comment-%2$d">%3$s</a>', bp_get_activity_comment_link(), bp_get_activity_id(), sprintf( __( 'Reply <span>%s</span>', 'buddypress' ), bp_activity_get_comment_count() ) );
 
 		return apply_filters( 'bp_insert_activity_meta', $content );
 	}
Index: bp-blogs/bp-blogs-loader.php
===================================================================
--- bp-blogs/bp-blogs-loader.php	(revision 4658)
+++ bp-blogs/bp-blogs-loader.php	(working copy)
@@ -105,7 +105,7 @@
 
 		// Add 'Sites' to the main navigation
 		$main_nav =  array(
-			'name'                => sprintf( __( 'Sites <span>(%d)</span>', 'buddypress' ), bp_blogs_total_blogs_for_user() ),
+			'name'                => sprintf( __( 'Sites <span>%d</span>', 'buddypress' ), bp_blogs_total_blogs_for_user() ),
 			'slug'                => $this->slug,
 			'position'            => 30,
 			'screen_function'     => 'bp_blogs_screen_my_blogs',
Index: bp-messages/bp-messages-loader.php
===================================================================
--- bp-messages/bp-messages-loader.php	(revision 4658)
+++ bp-messages/bp-messages-loader.php	(working copy)
@@ -93,7 +93,7 @@
 		global $bp;
 
 		if ( $count = messages_get_unread_count() )
-			$name = sprintf( __( 'Messages <strong>(%s)</strong>', 'buddypress' ), $count );
+			$name = sprintf( __( 'Messages <span>%s</span>', 'buddypress' ), $count );
 		else
 			$name = __( 'Messages <strong></strong>', 'buddypress' );
 
@@ -178,8 +178,8 @@
 
 			// Unread message count
 			if ( $count = messages_get_unread_count() ) {
-				$title = sprintf( __( 'Messages <strong>(%s)</strong>', 'buddypress' ), $count );
-				$inbox = sprintf( __( 'Inbox <strong>(%s)</strong>',    'buddypress' ), $count );
+				$title = sprintf( __( 'Messages <span>%s</span>', 'buddypress' ), $count );
+				$inbox = sprintf( __( 'Inbox <span>%s</span>',    'buddypress' ), $count );
 			} else {
 				$title = __( 'Messages', 'buddypress' );
 				$inbox = __( 'Inbox',    'buddypress' );
Index: bp-groups/bp-groups-loader.php
===================================================================
--- bp-groups/bp-groups-loader.php	(revision 4658)
+++ bp-groups/bp-groups-loader.php	(working copy)
@@ -223,7 +223,7 @@
 
 		// Add 'Groups' to the main navigation
 		$main_nav = array(
-			'name'                => sprintf( __( 'Groups <span>(%d)</span>', 'buddypress' ), groups_total_groups_for_user() ),
+			'name'                => sprintf( __( 'Groups <span>%d</span>', 'buddypress' ), groups_total_groups_for_user() ),
 			'slug'                => $this->slug,
 			'position'            => 70,
 			'screen_function'     => 'groups_screen_my_groups',
@@ -330,7 +330,7 @@
 			}
 
 			$sub_nav[] = array(
-				'name'            => sprintf( __( 'Members (%s)', 'buddypress' ), number_format( $this->current_group->total_member_count ) ),
+				'name'            => sprintf( __( 'Members <span>%s</span>', 'buddypress' ), number_format( $this->current_group->total_member_count ) ),
 				'slug'            => 'members',
 				'parent_url'      => $group_link,
 				'parent_slug'     => $this->current_group->slug,
@@ -385,7 +385,7 @@
 
 			if ( !empty( $count->total ) ) {
 				$title   = sprintf( __( 'Groups <strong>(%s)</strong>',          'buddypress' ), $count->total );
-				$pending = sprintf( __( 'Pending Invites <strong>(%s)</strong>', 'buddypress' ), $count->total );
+				$pending = sprintf( __( 'Pending Invites <span>%s</span>', 'buddypress' ), $count->total );
 			} else {
 				$title   = __( 'Groups',             'buddypress' );
 				$pending = __( 'No Pending Invites', 'buddypress' );