Index: bp-activity/bp-activity-admin.php
===================================================================
--- bp-activity/bp-activity-admin.php	(revision 6129)
+++ bp-activity/bp-activity-admin.php	(working copy)
@@ -138,7 +138,7 @@ function bp_activity_admin_screen_options( $value, $option, $new_value ) {
  * @since 1.0
  */
 function bp_activity_admin_edit_hidden_metaboxes( $hidden, $screen ) {
-	if ( empty( $screen->id ) || 'toplevel_page_bp-activity' != $screen->id )
+	if ( empty( $screen->id ) || 'toplevel_page_bp-activity' != $screen->id && 'toplevel_page_bp-activity_network' != $screen->id )
 		return $hidden;
 
 	// Hide the primary link meta box by default
@@ -199,11 +199,11 @@ function bp_activity_admin_load() {
 		);
 
 		// Register metaboxes for the edit screen.
-		add_meta_box( 'submitdiv',           _x( 'Status', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_status', 'toplevel_page_bp-activity', 'side', 'core' );
-		add_meta_box( 'bp_activity_itemids', _x( 'Primary Item/Secondary Item', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_itemids', 'toplevel_page_bp-activity', 'normal', 'core' );
-		add_meta_box( 'bp_activity_link',    _x( 'Link', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_link', 'toplevel_page_bp-activity', 'normal', 'core' );
-		add_meta_box( 'bp_activity_type',    _x( 'Type', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_type', 'toplevel_page_bp-activity', 'normal', 'core' );
-		add_meta_box( 'bp_activity_userid',  _x( 'Author ID', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_userid', 'toplevel_page_bp-activity', 'normal', 'core' );
+		add_meta_box( 'submitdiv',           _x( 'Status', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_status', get_current_screen()->id, 'side', 'core' );
+		add_meta_box( 'bp_activity_itemids', _x( 'Primary Item/Secondary Item', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_itemids', get_current_screen()->id, 'normal', 'core' );
+		add_meta_box( 'bp_activity_link',    _x( 'Link', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_link', get_current_screen()->id, 'normal', 'core' );
+		add_meta_box( 'bp_activity_type',    _x( 'Type', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_type', get_current_screen()->id, 'normal', 'core' );
+		add_meta_box( 'bp_activity_userid',  _x( 'Author ID', 'activity admin edit screen', 'buddypress' ), 'bp_activity_admin_edit_metabox_userid', get_current_screen()->id, 'normal', 'core' );
 
 		// Enqueue javascripts
 		wp_enqueue_script( 'postbox' );
@@ -588,12 +588,12 @@ function bp_activity_admin_edit() {
 						</div><!-- #post-body-content -->
 
 						<div id="postbox-container-1" class="postbox-container">
-							<?php do_meta_boxes( 'toplevel_page_bp-activity', 'side', $activity ); ?>
+							<?php do_meta_boxes( get_current_screen()->id, 'side', $activity ); ?>
 						</div>
 
 						<div id="postbox-container-2" class="postbox-container">
-							<?php do_meta_boxes( 'toplevel_page_bp-activity', 'normal', $activity ); ?>
-							<?php do_meta_boxes( 'toplevel_page_bp-activity', 'advanced', $activity ); ?>
+							<?php do_meta_boxes( get_current_screen()->id, 'normal', $activity ); ?>
+							<?php do_meta_boxes( get_current_screen()->id, 'advanced', $activity ); ?>
 						</div>
 					</div><!-- #post-body -->
 
Index: bp-activity/bp-activity-akismet.php
===================================================================
--- bp-activity/bp-activity-akismet.php	(revision 6129)
+++ bp-activity/bp-activity-akismet.php	(working copy)
@@ -496,7 +496,7 @@ class BP_Akismet {
 			return;
 
 		// Display meta box with a low priority (low position on screen by default)
-		add_meta_box( 'bp_activity_history',  __( 'Activity History', 'buddypress' ), array( $this, 'history_metabox' ), 'toplevel_page_bp-activity', 'normal', 'low' );
+		add_meta_box( 'bp_activity_history',  __( 'Activity History', 'buddypress' ), array( $this, 'history_metabox' ), get_current_screen()->id, 'normal', 'low' );
 	}
 
 	/**
Index: bp-core/admin/css/common.dev.css
===================================================================
--- bp-core/admin/css/common.dev.css	(revision 6129)
+++ bp-core/admin/css/common.dev.css	(working copy)
@@ -51,16 +51,21 @@ ul#adminmenu li.toplevel_page_bp-general-settings.wp-has-current-submenu .wp-men
 }
 
 /* Activity */
-ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image a img {
+ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image a img,
+ul#adminmenu li.toplevel_page_bp-activity_network .wp-menu-image a img {
 	display: none;
 }
-ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image a {
+ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image a,
+ul#adminmenu li.toplevel_page_bp-activity_network .wp-menu-image a {
 	background-image: url( ../images/menu.png ) !important;
 	background-position: 0 -34px;
 }
 ul#adminmenu li.toplevel_page_bp-activity:hover .wp-menu-image a,
 ul#adminmenu li.toplevel_page_bp-activity.current .wp-menu-image a,
-ul#adminmenu li.toplevel_page_bp-activity.wp-has-current-submenu .wp-menu-image a {
+ul#adminmenu li.toplevel_page_bp-activity.wp-has-current-submenu .wp-menu-image a,
+ul#adminmenu li.toplevel_page_bp-activity_network:hover .wp-menu-image a,
+ul#adminmenu li.toplevel_page_bp-activity_network.current .wp-menu-image a,
+ul#adminmenu li.toplevel_page_bp-activity_network.wp-has-current-submenu .wp-menu-image a {
 	background-position: 0 -2px;
 }