Index: src/bp-core/css/avatar.css
===================================================================
--- src/bp-core/css/avatar.css
+++ src/bp-core/css/avatar.css
@@ -1,3 +1,7 @@
+div.bp-uploader-window {
+	clear: both;
+}
+
 div.bp-avatar-status {
 	clear: both;
 	margin: 1em 0;
Index: src/bp-core/js/avatar.js
===================================================================
--- src/bp-core/js/avatar.js
+++ src/bp-core/js/avatar.js
@@ -63,16 +63,10 @@
 
 			// Group Manage
 			} else if ( $( '#group-settings-form' ).length ) {
-				$( '#group-settings-form p' ).each( function( i ) {
-					if ( 0 !== i ) {
-						$( this ).remove();
-					}
+				$( 'p input' ).each( function( i ) {
+					$( this ).remove();
 				} );
 
-				if ( $( '#delete-group-avatar-button' ).length ) {
-					$( '#delete-group-avatar-button' ).remove();
-				}
-
 			// Group Create
 			} else if ( $( '#group-create-body' ).length ) {
 				$( '.main-column p #file' ).remove();
Index: src/bp-templates/bp-legacy/buddypress/groups/single/admin.php
===================================================================
--- src/bp-templates/bp-legacy/buddypress/groups/single/admin.php
+++ src/bp-templates/bp-legacy/buddypress/groups/single/admin.php
@@ -166,22 +166,25 @@
 
 	<?php if ( 'upload-image' == bp_get_avatar_admin_step() ) : ?>
 
-			<p><?php _e("Upload an image to use as a profile photo for this group. The image will be shown on the main group page, and in search results.", 'buddypress' ); ?></p>
-
-			<p>
-				<input type="file" name="file" id="file" />
-				<input type="submit" name="upload" id="upload" value="<?php esc_attr_e( 'Upload Image', 'buddypress' ); ?>" />
-				<input type="hidden" name="action" id="action" value="bp_avatar_upload" />
-			</p>
-
 			<?php if ( bp_get_group_has_avatar() ) : ?>
 
 				<p><?php _e( "If you'd like to remove the existing group profile photo but not upload a new one, please use the delete group profile photo button.", 'buddypress' ); ?></p>
 
 				<?php bp_button( array( 'id' => 'delete_group_avatar', 'component' => 'groups', 'wrapper_id' => 'delete-group-avatar-button', 'link_class' => 'edit', 'link_href' => bp_get_group_avatar_delete_link(), 'link_title' => __( 'Delete Group Profile Photo', 'buddypress' ), 'link_text' => __( 'Delete Group Profile Photo', 'buddypress' ) ) ); ?>
 
+				<p><?php _e( 'Or:', 'buddypress' ); ?></p>
+
 			<?php endif; ?>
 
+
+			<p><?php _e("Upload an image to use as a profile photo for this group. The image will be shown on the main group page, and in search results.", 'buddypress' ); ?></p>
+
+			<p>
+				<input type="file" name="file" id="file" />
+				<input type="submit" name="upload" id="upload" value="<?php esc_attr_e( 'Upload Image', 'buddypress' ); ?>" />
+				<input type="hidden" name="action" id="action" value="bp_avatar_upload" />
+			</p>
+
 			<?php
 			/**
 			 * Load the Avatar UI templates
Index: src/bp-templates/bp-legacy/buddypress/members/single/profile/change-avatar.php
===================================================================
--- src/bp-templates/bp-legacy/buddypress/members/single/profile/change-avatar.php
+++ src/bp-templates/bp-legacy/buddypress/members/single/profile/change-avatar.php
@@ -11,7 +11,17 @@
 
 <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
 
-	<p><?php _e( 'Your profile photo will be used on your profile and throughout the site. If there is a <a href="http://gravatar.com">Gravatar</a> associated with your account email we will use that, or you can upload an image from your computer.', 'buddypress' ); ?></p>
+	<?php if ( bp_get_user_has_avatar() ) : ?>
+		<p><?php _e( "If you'd like to delete your current profile photo but not upload a new one, please use the delete profile photo button.", 'buddypress' ); ?></p>
+		<p><a class="button edit" href="<?php bp_avatar_delete_link(); ?>" title="<?php esc_attr_e( 'Delete Profile Photo', 'buddypress' ); ?>"><?php _e( 'Delete My Profile Photo', 'buddypress' ); ?></a></p>
+
+		<p><?php _e( 'Or you can upload a new photo:', 'buddypress' ); ?></p>
+
+	<?php else : ?>
+
+		<p><?php _e( 'Your profile photo will be used on your profile and throughout the site. If there is a <a href="http://gravatar.com">Gravatar</a> associated with your account email we will use that, or you can upload an image from your computer.', 'buddypress' ); ?></p>
+
+	<?php endif; ?>
 
 	<form action="" method="post" id="avatar-upload-form" class="standard-form" enctype="multipart/form-data">
 
@@ -26,11 +36,6 @@
 				<input type="hidden" name="action" id="action" value="bp_avatar_upload" />
 			</p>
 
-			<?php if ( bp_get_user_has_avatar() ) : ?>
-				<p><?php _e( "If you'd like to delete your current profile photo but not upload a new one, please use the delete profile photo button.", 'buddypress' ); ?></p>
-				<p><a class="button edit" href="<?php bp_avatar_delete_link(); ?>" title="<?php esc_attr_e( 'Delete Profile Photo', 'buddypress' ); ?>"><?php _e( 'Delete My Profile Photo', 'buddypress' ); ?></a></p>
-			<?php endif; ?>
-
 		<?php endif; ?>
 
 		<?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
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
@@ -841,6 +841,10 @@
 	position: absolute;
 }
 
+#delete-group-avatar-button {
+	margin-bottom: 2em;
+}
+
 /*--------------------------------------------------------------
 3.6 - Ajax Loading
 --------------------------------------------------------------*/
@@ -1376,7 +1380,9 @@
 	overflow: auto;
 	list-style: none;
 }
-
+body.change-avatar #bp-avatar-delete, body.group-avatar div.bp-avatar-nav {
+	display: none;
+}
 
 /*--------------------------------------------------------------
 3.9 - Private Messaging Threads