Index: src/bp-activity/bp-activity-admin.php
===================================================================
--- src/bp-activity/bp-activity-admin.php	(revision 10223)
+++ src/bp-activity/bp-activity-admin.php	(working copy)
@@ -660,7 +660,6 @@
 	do_action_ref_array( 'bp_activity_admin_edit', array( &$activity ) ); ?>
 
 	<div class="wrap">
-		<?php screen_icon( 'buddypress-activity' ); ?>
 		<h2><?php printf( __( 'Editing Activity (ID #%s)', 'buddypress' ), number_format_i18n( (int) $_REQUEST['aid'] ) ); ?></h2>
 
 		<?php if ( ! empty( $activity ) ) : ?>
@@ -977,7 +976,6 @@
 	do_action( 'bp_activity_admin_index', $messages ); ?>
 
 	<div class="wrap">
-		<?php screen_icon( 'buddypress-activity' ); ?>
 		<h2>
 			<?php if ( !empty( $_REQUEST['aid'] ) ) : ?>
 				<?php printf( __( 'Activity related to ID #%s', 'buddypress' ), number_format_i18n( (int) $_REQUEST['aid'] ) ); ?>
Index: src/bp-core/admin/bp-core-admin-components.php
===================================================================
--- src/bp-core/admin/bp-core-admin-components.php	(revision 10223)
+++ src/bp-core/admin/bp-core-admin-components.php	(working copy)
@@ -20,7 +20,6 @@
 ?>
 
 	<div class="wrap">
-		<?php screen_icon( 'buddypress'); ?>
 
 		<h2 class="nav-tab-wrapper"><?php bp_core_admin_tabs( __( 'Components', 'buddypress' ) ); ?></h2>
 		<form action="" method="post" id="bp-admin-component-form">
Index: src/bp-core/admin/bp-core-admin-functions.php
===================================================================
--- src/bp-core/admin/bp-core-admin-functions.php	(revision 10223)
+++ src/bp-core/admin/bp-core-admin-functions.php	(working copy)
@@ -100,7 +100,6 @@
 	$settings_url = add_query_arg( 'page', 'bp-components', $url ); ?>
 
 	<div class="wrap">
-		<?php screen_icon( 'buddypress' ); ?>
 		<h2><?php _e( 'Why have all my BuddyPress menus disappeared?', 'buddypress' ); ?></h2>
 
 		<p><?php _e( "Don't worry! We've moved the BuddyPress options into more convenient and easier to find locations. You're seeing this page because you are running a legacy BuddyPress plugin which has not been updated.", 'buddypress' ); ?></p>
Index: src/bp-core/admin/bp-core-admin-settings.php
===================================================================
--- src/bp-core/admin/bp-core-admin-settings.php	(revision 10223)
+++ src/bp-core/admin/bp-core-admin-settings.php	(working copy)
@@ -264,7 +264,6 @@
  *
  * @since 1.6.0
  *
- * @uses screen_icon() To display the screen icon.
  * @uses settings_fields() To output the hidden fields for the form.
  * @uses do_settings_sections() To output the settings sections.
  */
@@ -277,8 +276,6 @@
 
 	<div class="wrap">
 
-		<?php screen_icon( 'buddypress' ); ?>
-
 		<h2 class="nav-tab-wrapper"><?php bp_core_admin_tabs( __( 'Settings', 'buddypress' ) ); ?></h2>
 
 		<form action="<?php echo esc_url( $form_action ) ?>" method="post">
Index: src/bp-core/admin/bp-core-admin-slugs.php
===================================================================
--- src/bp-core/admin/bp-core-admin-slugs.php	(revision 10223)
+++ src/bp-core/admin/bp-core-admin-slugs.php	(working copy)
@@ -20,7 +20,6 @@
 ?>
 
 	<div class="wrap">
-		<?php screen_icon( 'buddypress'); ?>
 
 		<h2 class="nav-tab-wrapper"><?php bp_core_admin_tabs( __( 'Pages', 'buddypress' ) ); ?></h2>
 		<form action="" method="post" id="bp-admin-page-form">
Index: src/bp-core/admin/bp-core-admin-tools.php
===================================================================
--- src/bp-core/admin/bp-core-admin-tools.php	(revision 10223)
+++ src/bp-core/admin/bp-core-admin-tools.php	(working copy)
@@ -19,7 +19,6 @@
 function bp_core_admin_tools() {
 	?>
 	<div class="wrap">
-		<?php screen_icon( 'buddypress'); ?>
 
 		<h2><?php esc_html_e( 'BuddyPress Tools', 'buddypress' ) ?></h2>
 
Index: src/bp-groups/bp-groups-admin.php
===================================================================
--- src/bp-groups/bp-groups-admin.php	(revision 10223)
+++ src/bp-groups/bp-groups-admin.php	(working copy)
@@ -567,7 +567,6 @@
 	do_action_ref_array( 'bp_groups_admin_edit', array( &$group ) ); ?>
 
 	<div class="wrap">
-		<?php screen_icon( 'buddypress-groups' ); ?>
 		<h2><?php _e( 'Edit Group', 'buddypress' ); ?>
 
 			<?php if ( is_user_logged_in() && bp_user_can_create_groups() ) : ?>
@@ -664,7 +663,6 @@
 	$base_url  = remove_query_arg( array( 'action', 'action2', 'paged', 's', '_wpnonce', 'gid' ), $_SERVER['REQUEST_URI'] ); ?>
 
 	<div class="wrap">
-		<?php screen_icon( 'buddypress-groups' ); ?>
 		<h2><?php _e( 'Delete Groups', 'buddypress' ) ?></h2>
 		<p><?php _e( 'You are about to delete the following groups:', 'buddypress' ) ?></p>
 
@@ -722,7 +720,6 @@
 	do_action( 'bp_groups_admin_index', $messages ); ?>
 
 	<div class="wrap">
-		<?php screen_icon( 'buddypress-groups' ); ?>
 		<h2>
 			<?php _e( 'Groups', 'buddypress' ); ?>
 
Index: src/bp-members/bp-members-admin.php
===================================================================
--- src/bp-members/bp-members-admin.php	(revision 10223)
+++ src/bp-members/bp-members-admin.php	(working copy)
@@ -893,7 +893,6 @@
 		<?php endif; ?>
 
 		<div class="wrap" id="community-profile-page">
-			<?php screen_icon( 'users' ); ?>
 			<h2><?php echo esc_html( $title ); ?>
 
 				<?php if ( empty( $this->is_self_profile ) ) : ?>
@@ -1847,7 +1846,6 @@
 		?>
 
 		<div class="wrap">
-			<?php screen_icon( 'users' ); ?>
 			<h2><?php _e( 'Users', 'buddypress' ); ?>
 
 				<?php if ( current_user_can( 'create_users' ) ) : ?>
@@ -1968,7 +1966,6 @@
 		?>
 
 		<div class="wrap">
-			<?php screen_icon( 'users' ); ?>
 			<h2><?php echo esc_html( $header_text ); ?></h2>
 			<p><?php echo esc_html( $helper_text ); ?></p>
 
Index: src/bp-xprofile/bp-xprofile-admin.php
===================================================================
--- src/bp-xprofile/bp-xprofile-admin.php	(revision 10223)
+++ src/bp-xprofile/bp-xprofile-admin.php	(working copy)
@@ -86,8 +86,6 @@
 
 	<div class="wrap">
 
-		<?php screen_icon( 'users' ); ?>
-
 		<h2>
 			<?php _ex( 'Profile Fields', 'Settings page header', 'buddypress'); ?>
 			<a id="add_group" class="add-new-h2" href="users.php?page=bp-profile-setup&amp;mode=add_group"><?php _e( 'Add New Field Group', 'buddypress' ); ?></a>
Index: src/bp-xprofile/classes/class-bp-xprofile-field.php
===================================================================
--- src/bp-xprofile/classes/class-bp-xprofile-field.php	(revision 10223)
+++ src/bp-xprofile/classes/class-bp-xprofile-field.php	(working copy)
@@ -1115,8 +1115,6 @@
 
 		<div class="wrap">
 
-			<?php screen_icon( 'users' ); ?>
-
 			<h2><?php echo esc_html( $title ); ?></h2>
 
 			<?php if ( !empty( $message ) ) : ?>
Index: src/bp-xprofile/classes/class-bp-xprofile-group.php
===================================================================
--- src/bp-xprofile/classes/class-bp-xprofile-group.php	(revision 10223)
+++ src/bp-xprofile/classes/class-bp-xprofile-group.php	(working copy)
@@ -723,8 +723,6 @@
 
 		<div class="wrap">
 
-			<?php screen_icon( 'users' ); ?>
-
 			<h2><?php echo esc_html( $title ); ?></h2>
 
 			<?php if ( ! empty( $message ) ) : ?>