Index: bp-members/bp-members-adminbar.php
===================================================================
--- bp-members/bp-members-adminbar.php	(revision 7737)
+++ bp-members/bp-members-adminbar.php	(working copy)
@@ -102,12 +102,15 @@
 		) );
 
 		// User Admin > Edit this user's avatar
-		$wp_admin_bar->add_menu( array(
-			'parent' => $bp->user_admin_menu_id,
-			'id'     => $bp->user_admin_menu_id . '-change-avatar',
-			'title'  => __( "Edit Avatar", 'buddypress' ),
-			'href'   => bp_get_members_component_link( 'profile', 'change-avatar' )
-		) );
+		if( buddypress()->avatar->show_avatars ) {
+			$wp_admin_bar->add_menu( array(
+				'parent' => $bp->user_admin_menu_id,
+				'id'     => $bp->user_admin_menu_id . '-change-avatar',
+				'title'  => __( "Edit Avatar", 'buddypress' ),
+				'href'   => bp_get_members_component_link( 'profile', 'change-avatar' )
+			) );
+		}
+		
 	}
 
 	if ( bp_is_active( 'settings' ) ) {
Index: bp-xprofile/bp-xprofile-loader.php
===================================================================
--- bp-xprofile/bp-xprofile-loader.php	(revision 7737)
+++ bp-xprofile/bp-xprofile-loader.php	(working copy)
@@ -200,15 +200,17 @@
 		);
 
 		// Change Avatar
-		$sub_nav[] = array(
-			'name'            => __( 'Change Avatar', 'buddypress' ),
-			'slug'            => 'change-avatar',
-			'parent_url'      => $profile_link,
-			'parent_slug'     => $this->slug,
-			'screen_function' => 'xprofile_screen_change_avatar',
-			'position'        => 30,
-			'user_has_access' => bp_core_can_edit_settings()
-		);
+		if( buddypress()->avatar->show_avatars ) {
+			$sub_nav[] = array(
+				'name'            => __( 'Change Avatar', 'buddypress' ),
+				'slug'            => 'change-avatar',
+				'parent_url'      => $profile_link,
+				'parent_slug'     => $this->slug,
+				'screen_function' => 'xprofile_screen_change_avatar',
+				'position'        => 30,
+				'user_has_access' => bp_core_can_edit_settings()
+			);
+		}
 
 		parent::setup_nav( $main_nav, $sub_nav );
 	}
@@ -252,13 +254,15 @@
 				'href'   => trailingslashit( $profile_link . 'edit' )
 			);
 
-			// Edit Profile
-			$wp_admin_nav[] = array(
-				'parent' => 'my-account-' . $this->id,
-				'id'     => 'my-account-' . $this->id . '-change-avatar',
-				'title'  => __( 'Change Avatar', 'buddypress' ),
-				'href'   => trailingslashit( $profile_link . 'change-avatar' )
-			);
+			// Edit Avatar
+			if( buddypress()->avatar->show_avatars ) {
+				$wp_admin_nav[] = array(
+					'parent' => 'my-account-' . $this->id,
+					'id'     => 'my-account-' . $this->id . '-change-avatar',
+					'title'  => __( 'Change Avatar', 'buddypress' ),
+					'href'   => trailingslashit( $profile_link . 'change-avatar' )
+				);
+			}
 
 		}