Index: bp-groups/bp-groups-adminbar.php
===================================================================
--- bp-groups/bp-groups-adminbar.php
+++ bp-groups/bp-groups-adminbar.php
@@ -67,12 +67,14 @@ function bp_groups_group_admin_menu() {
 	) );
 
 	// Group Admin > Group avatar
-	$wp_admin_bar->add_menu( array(
-		'parent' => $bp->group_admin_menu_id,
-		'id'     => 'group-avatar',
-		'title'  => __( 'Edit Avatar', 'buddypress' ),
-		'href'   =>  bp_get_groups_action_link( 'admin/group-avatar' )
-	) );
+	if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) {
+		$wp_admin_bar->add_menu( array(
+			'parent' => $bp->group_admin_menu_id,
+			'id'     => 'group-avatar',
+			'title'  => __( 'Edit Avatar', 'buddypress' ),
+			'href'   =>  bp_get_groups_action_link( 'admin/group-avatar' )
+		) );
+	}
 
 	// Group Admin > Manage invitations
 	if ( bp_is_active( 'friends' ) ) {
Index: bp-groups/bp-groups-buddybar.php
===================================================================
--- bp-groups/bp-groups-buddybar.php
+++ bp-groups/bp-groups-buddybar.php
@@ -20,7 +20,11 @@ function bp_groups_adminbar_admin_menu() {
 
 			<li><a href="<?php bp_groups_action_link( 'admin/group-settings' );  ?>"><?php _e( 'Group Settings', 'buddypress' ); ?></a></li>
 
-			<li><a href="<?php bp_groups_action_link( 'admin/group-avatar' ); ?>"><?php _e( 'Group Avatar', 'buddypress' ); ?></a></li>
+			<?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
+
+				<li><a href="<?php bp_groups_action_link( 'admin/group-avatar' ); ?>"><?php _e( 'Group Avatar', 'buddypress' ); ?></a></li>
+
+			<?php endif; ?>
 
 			<?php if ( bp_is_active( 'friends' ) ) : ?>
 
Index: bp-groups/bp-groups-loader.php
===================================================================
--- bp-groups/bp-groups-loader.php
+++ bp-groups/bp-groups-loader.php
@@ -188,12 +188,17 @@ class BP_Groups_Component extends BP_Component {
 			'group-settings' => array(
 				'name'       => __( 'Settings', 'buddypress' ),
 				'position'   => 10
-			),
-			'group-avatar'   => array(
-				'name'       => __( 'Avatar',   'buddypress' ),
-				'position'   => 20 ),
+			)
 		) );
 
+		// If avatar uploads are not disabled, add avatar option
+		if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) {
+			$this->group_creation_steps['group-avatar'] = array(
+				'name'     => __( 'Avatar',   'buddypress' ),
+				'position' => 20
+			);
+		}
+
 		// If friends component is active, add invitations
 		if ( bp_is_active( 'friends' ) ) {
 			$this->group_creation_steps['group-invites'] = array(
Index: bp-groups/bp-groups-template.php
===================================================================
--- bp-groups/bp-groups-template.php
+++ bp-groups/bp-groups-template.php
@@ -1277,7 +1277,11 @@ function bp_group_admin_tabs( $group = false ) {
 			return false;
 	?>
 	<li<?php if ( 'group-settings' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ?>/admin/group-settings"><?php _e( 'Settings', 'buddypress' ); ?></a></li>
-	<li<?php if ( 'group-avatar'   == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ?>/admin/group-avatar"><?php _e( 'Avatar', 'buddypress' ); ?></a></li>
+
+	<?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
+		<li<?php if ( 'group-avatar'   == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ?>/admin/group-avatar"><?php _e( 'Avatar', 'buddypress' ); ?></a></li>
+	<?php endif; ?>
+
 	<li<?php if ( 'manage-members' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ?>/admin/manage-members"><?php _e( 'Members', 'buddypress' ); ?></a></li>
 
 	<?php if ( $groups_template->group->status == 'private' ) : ?>