Index: src/bp-templates/bp-legacy/buddypress-functions.php
===================================================================
--- src/bp-templates/bp-legacy/buddypress-functions.php
+++ src/bp-templates/bp-legacy/buddypress-functions.php
@@ -1851,7 +1851,7 @@
 			color: #FFF;
 			text-rendering: optimizelegibility;
 			text-shadow: 0px 0px 3px rgba( 0, 0, 0, 0.8 );
-			margin: 0;
+			margin: 0 0 .6em;
 			font-size:200%;
 		}
 
@@ -1866,13 +1866,14 @@
 		}
 
 		#buddypress #item-header-cover-image #item-buttons {
-			overflow:hidden;
-			margin: 20px 0 10px;
+			margin: 0 0 10px;
 			padding: 0 0 5px;
 		}
 
-		#buddypress #item-header-cover-image #item-buttons:before {
-			content:"\00a0";
+		#buddypress #item-header-cover-image #item-buttons:after {
+			clear: both;
+			content: "";
+			display: table;
 		}
 
 		@media screen and (max-width: 782px) {
Index: src/bp-templates/bp-legacy/buddypress/groups/single/cover-image-header.php
===================================================================
--- src/bp-templates/bp-legacy/buddypress/groups/single/cover-image-header.php
+++ src/bp-templates/bp-legacy/buddypress/groups/single/cover-image-header.php
@@ -29,18 +29,14 @@
 
 		<div id="item-header-content">
 
-			<div id="item-buttons">
-
-				<?php
+			<div id="item-buttons"><?php
 
 				/**
 				 * Fires in the group header actions section.
 				 *
 				 * @since 1.2.6
 				 */
-				do_action( 'bp_group_header_actions' ); ?>
-
-			</div><!-- #item-buttons -->
+				do_action( 'bp_group_header_actions' ); ?></div><!-- #item-buttons -->
 
 			<?php
 
Index: src/bp-templates/bp-legacy/buddypress/members/single/cover-image-header.php
===================================================================
--- src/bp-templates/bp-legacy/buddypress/members/single/cover-image-header.php
+++ src/bp-templates/bp-legacy/buddypress/members/single/cover-image-header.php
@@ -35,18 +35,14 @@
 				<h2 class="user-nicename">@<?php bp_displayed_user_mentionname(); ?></h2>
 			<?php endif; ?>
 
-			<div id="item-buttons">
-
-				<?php
+			<div id="item-buttons"><?php
 
 				/**
 				 * Fires in the member header actions section.
 				 *
 				 * @since 1.2.6
 				 */
-				do_action( 'bp_member_header_actions' ); ?>
-
-			</div><!-- #item-buttons -->
+				do_action( 'bp_member_header_actions' ); ?></div><!-- #item-buttons -->
 
 			<span class="activity"><?php bp_last_activity( bp_displayed_user_id() ); ?></span>
 
Index: src/bp-templates/bp-legacy/css/buddypress.css
===================================================================
--- src/bp-templates/bp-legacy/css/buddypress.css
+++ src/bp-templates/bp-legacy/css/buddypress.css
@@ -1404,6 +1404,9 @@
 	overflow: auto;
 	list-style: none;
 }
+#buddypress #item-buttons:empty {
+	display: none;
+}
 
 /*--------------------------------------------------------------
 3.8.1 - Cover Image