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
@@ -13,104 +13,106 @@
  */
 do_action( 'bp_before_group_header' ); ?>
 
-<a id="header-cover-image" href="<?php bp_group_permalink(); ?>"></a>
+<div id="cover-image-container">
+	<a id="header-cover-image" href="<?php bp_group_permalink(); ?>"></a>
 
-<div id="item-header-cover-image">
-	<?php if ( ! bp_disable_group_avatar_uploads() ) : ?>
-		<div id="item-header-avatar">
-			<a href="<?php bp_group_permalink(); ?>" title="<?php bp_group_name(); ?>">
+	<div id="item-header-cover-image">
+		<?php if ( ! bp_disable_group_avatar_uploads() ) : ?>
+			<div id="item-header-avatar">
+				<a href="<?php bp_group_permalink(); ?>" title="<?php bp_group_name(); ?>">
 
-				<?php bp_group_avatar(); ?>
+					<?php bp_group_avatar(); ?>
 
-			</a>
-		</div><!-- #item-header-avatar -->
-	<?php endif; ?>
+				</a>
+			</div><!-- #item-header-avatar -->
+		<?php endif; ?>
 
-	<div id="item-header-content">
+		<div id="item-header-content">
 
-		<div id="item-buttons">
+			<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 -->
+				<?php
 
-		<?php
-
-		/**
-		 * Fires before the display of the group's header meta.
-		 *
-		 * @since 1.2.0
-		 */
-		do_action( 'bp_before_group_header_meta' ); ?>
+				/**
+				 * Fires in the group header actions section.
+				 *
+				 * @since 1.2.6
+				 */
+				do_action( 'bp_group_header_actions' ); ?>
 
-		<div id="item-meta">
+			</div><!-- #item-buttons -->
 
 			<?php
 
 			/**
-			 * Fires after the group header actions section.
+			 * Fires before the display of the group's header meta.
 			 *
 			 * @since 1.2.0
 			 */
-			do_action( 'bp_group_header_meta' ); ?>
+			do_action( 'bp_before_group_header_meta' ); ?>
 
-			<span class="highlight"><?php bp_group_type(); ?></span>
-			<span class="activity"><?php printf( __( 'active %s', 'buddypress' ), bp_get_group_last_active() ); ?></span>
+			<div id="item-meta">
 
-			<?php bp_group_description(); ?>
+				<?php
 
-		</div>
-	</div><!-- #item-header-content -->
+				/**
+				 * Fires after the group header actions section.
+				 *
+				 * @since 1.2.0
+				 */
+				do_action( 'bp_group_header_meta' ); ?>
 
-	<div id="item-actions">
+				<span class="highlight"><?php bp_group_type(); ?></span>
+				<span class="activity"><?php printf( __( 'active %s', 'buddypress' ), bp_get_group_last_active() ); ?></span>
 
-		<?php if ( bp_group_is_visible() ) : ?>
+				<?php bp_group_description(); ?>
 
-			<h3><?php _e( 'Group Admins', 'buddypress' ); ?></h3>
+			</div>
+		</div><!-- #item-header-content -->
 
-			<?php bp_group_list_admins();
+		<div id="item-actions">
 
-			/**
-			 * Fires after the display of the group's administrators.
-			 *
-			 * @since 1.1.0
-			 */
-			do_action( 'bp_after_group_menu_admins' );
+			<?php if ( bp_group_is_visible() ) : ?>
+
+				<h3><?php _e( 'Group Admins', 'buddypress' ); ?></h3>
 
-			if ( bp_group_has_moderators() ) :
+				<?php bp_group_list_admins();
 
 				/**
-				 * Fires before the display of the group's moderators, if there are any.
+				 * Fires after the display of the group's administrators.
 				 *
 				 * @since 1.1.0
 				 */
-				do_action( 'bp_before_group_menu_mods' ); ?>
+				do_action( 'bp_after_group_menu_admins' );
 
-				<h3><?php _e( 'Group Mods' , 'buddypress' ); ?></h3>
+				if ( bp_group_has_moderators() ) :
 
-				<?php bp_group_list_mods();
+					/**
+					 * Fires before the display of the group's moderators, if there are any.
+					 *
+					 * @since 1.1.0
+					 */
+					do_action( 'bp_before_group_menu_mods' ); ?>
 
-				/**
-				 * Fires after the display of the group's moderators, if there are any.
-				 *
-				 * @since 1.1.0
-				 */
-				do_action( 'bp_after_group_menu_mods' );
+					<h3><?php _e( 'Group Mods' , 'buddypress' ); ?></h3>
+
+					<?php bp_group_list_mods();
+
+					/**
+					 * Fires after the display of the group's moderators, if there are any.
+					 *
+					 * @since 1.1.0
+					 */
+					do_action( 'bp_after_group_menu_mods' );
 
-			endif;
+				endif;
 
-		endif; ?>
+			endif; ?>
 
-	</div><!-- #item-actions -->
+		</div><!-- #item-actions -->
 
-</div><!-- #item-header-cover-image -->
+	</div><!-- #item-header-cover-image -->
+</div><!-- #cover-image-container -->
 
 <?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
@@ -17,78 +17,80 @@
  */
 do_action( 'bp_before_member_header' ); ?>
 
-<a id="header-cover-image" href="<?php bp_displayed_user_link(); ?>"></a>
+<div id="cover-image-container">
+	<a id="header-cover-image" href="<?php bp_displayed_user_link(); ?>"></a>
 
-<div id="item-header-cover-image">
-	<div id="item-header-avatar">
-		<a href="<?php bp_displayed_user_link(); ?>">
+	<div id="item-header-cover-image">
+		<div id="item-header-avatar">
+			<a href="<?php bp_displayed_user_link(); ?>">
 
-			<?php bp_displayed_user_avatar( 'type=full' ); ?>
+				<?php bp_displayed_user_avatar( 'type=full' ); ?>
 
-		</a>
-	</div><!-- #item-header-avatar -->
+			</a>
+		</div><!-- #item-header-avatar -->
 
-	<div id="item-header-content">
+		<div id="item-header-content">
 
-		<?php if ( bp_is_active( 'activity' ) && bp_activity_do_mentions() ) : ?>
-			<h2 class="user-nicename">@<?php bp_displayed_user_mentionname(); ?></h2>
-		<?php endif; ?>
+			<?php if ( bp_is_active( 'activity' ) && bp_activity_do_mentions() ) : ?>
+				<h2 class="user-nicename">@<?php bp_displayed_user_mentionname(); ?></h2>
+			<?php endif; ?>
 
-		<div id="item-buttons">
+			<div id="item-buttons">
 
-			<?php
+				<?php
 
-			/**
-			 * Fires in the member header actions section.
-			 *
-			 * @since 1.2.6
-			 */
-			do_action( 'bp_member_header_actions' ); ?>
+				/**
+				 * Fires in the member header actions section.
+				 *
+				 * @since 1.2.6
+				 */
+				do_action( 'bp_member_header_actions' ); ?>
 
-		</div><!-- #item-buttons -->
+			</div><!-- #item-buttons -->
 
-		<span class="activity"><?php bp_last_activity( bp_displayed_user_id() ); ?></span>
+			<span class="activity"><?php bp_last_activity( bp_displayed_user_id() ); ?></span>
 
-		<?php
+			<?php
 
-		/**
-		 * Fires before the display of the member's header meta.
-		 *
-		 * @since 1.2.0
-		 */
-		do_action( 'bp_before_member_header_meta' ); ?>
+			/**
+			 * Fires before the display of the member's header meta.
+			 *
+			 * @since 1.2.0
+			 */
+			do_action( 'bp_before_member_header_meta' ); ?>
 
-		<div id="item-meta">
+			<div id="item-meta">
 
-			<?php if ( bp_is_active( 'activity' ) ) : ?>
+				<?php if ( bp_is_active( 'activity' ) ) : ?>
 
-				<div id="latest-update">
+					<div id="latest-update">
 
-					<?php bp_activity_latest_update( bp_displayed_user_id() ); ?>
+						<?php bp_activity_latest_update( bp_displayed_user_id() ); ?>
 
-				</div>
+					</div>
 
-			<?php endif; ?>
+				<?php endif; ?>
 
-			<?php
+				<?php
 
-			 /**
-			  * Fires after the group header actions section.
-			  *
-			  * If you'd like to show specific profile fields here use:
-			  * bp_member_profile_data( 'field=About Me' ); -- Pass the name of the field
-			  *
-			  * @since 1.2.0
-			  */
-			 do_action( 'bp_profile_header_meta' );
+				 /**
+				  * Fires after the group header actions section.
+				  *
+				  * If you'd like to show specific profile fields here use:
+				  * bp_member_profile_data( 'field=About Me' ); -- Pass the name of the field
+				  *
+				  * @since 1.2.0
+				  */
+				 do_action( 'bp_profile_header_meta' );
 
-			 ?>
+				 ?>
 
-		</div><!-- #item-meta -->
+			</div><!-- #item-meta -->
 
-	</div><!-- #item-header-content -->
+		</div><!-- #item-header-content -->
 
-</div><!-- #item-header-cover-image -->
+	</div><!-- #item-header-cover-image -->
+</div><!-- #cover-image-container -->
 
 <?php
 
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
@@ -1175,7 +1175,6 @@
 }
 #buddypress div#item-header {
 	overflow: hidden;
-	position: relative;
 }
 #buddypress div#item-header div#item-header-content {
 	float: left;
@@ -1408,6 +1407,10 @@
 3.8.1 - Cover Image
 --------------------------------------------------------------*/
 
+#buddypress #cover-image-container {
+	position: relative;
+}
+
 #buddypress #header-cover-image {
 	background-color: #c5c5c5;
 	background-position: center top;