Index: bp-activity/bp-activity-loader.php
===================================================================
--- bp-activity/bp-activity-loader.php
+++ bp-activity/bp-activity-loader.php
@@ -269,6 +269,14 @@
 				'href'   => trailingslashit( $activity_link )
 			);
 
+			// Personal
+			$wp_admin_nav[] = array(
+				'parent' => 'my-account-' . $this->id,
+				'id'     => 'my-account-' . $this->id . '-personal',
+				'title'  => __( 'Personal', 'buddypress' ),
+				'href'   => trailingslashit( $activity_link )
+			);
+
 			// Mentions
 			if ( bp_activity_do_mentions() ) {
 				$wp_admin_nav[] = array(
@@ -279,14 +287,6 @@
 				);
 			}
 
-			// Personal
-			$wp_admin_nav[] = array(
-				'parent' => 'my-account-' . $this->id,
-				'id'     => 'my-account-' . $this->id . '-personal',
-				'title'  => __( 'Personal', 'buddypress' ),
-				'href'   => trailingslashit( $activity_link )
-			);
-
 			// Favorites
 			$wp_admin_nav[] = array(
 				'parent' => 'my-account-' . $this->id,
Index: bp-xprofile/bp-xprofile-loader.php
===================================================================
--- bp-xprofile/bp-xprofile-loader.php
+++ bp-xprofile/bp-xprofile-loader.php
@@ -44,6 +44,8 @@
 				'adminbar_myaccount_order' => 20
 			)
 		);
+
+		$this->setup_hooks();
 	}
 
 	/**
@@ -282,26 +284,21 @@
 				);
 			}
 
-			// Privacy Settings
-			if ( bp_is_active( 'settings' ) ) {
-
-				// Setup the logged in user variables
-				$settings_link = trailingslashit( bp_loggedin_user_domain() . bp_get_settings_slug() );
-
-				// Add main Settings menu
-				$wp_admin_nav[] = array(
-					'parent' => 'my-account-' . $bp->settings->id,
-					'id'     => 'my-account-' . $bp->settings->id . '-profile',
-					'title'  => __( 'Profile', 'buddypress' ),
-					'href'   => trailingslashit( $settings_link . 'profile' )
-				);
-			}
 		}
 
 		parent::setup_admin_bar( $wp_admin_nav );
 	}
 
 	/**
+	 * Add custom hooks.
+	 *
+	 * @since BuddyPress (2.0.0)
+	 */
+	public function setup_hooks() {
+		add_filter( 'bp_settings_admin_nav', array( $this, 'setup_settings_admin_nav' ), 2 );
+	}
+
+	/**
 	 * Sets up the title for pages and <title>
 	 */
 	public function setup_title() {
@@ -322,6 +319,29 @@
 
 		parent::setup_title();
 	}
+
+	/**
+	 * Adds "Settings > Profile" subnav item under the "Settings" adminbar menu.
+	 *
+	 * @since BuddyPress (2.0.0)
+	 *
+	 * @param array $wp_admin_nav The settings adminbar nav array.
+	 * @return array
+	 */
+	public function setup_settings_admin_nav( $wp_admin_nav ) {
+		// Setup the logged in user variables
+		$settings_link = trailingslashit( bp_loggedin_user_domain() . bp_get_settings_slug() );
+
+		// Add the "Profile" subnav item
+		$wp_admin_nav[] = array(
+			'parent' => 'my-account-' . buddypress()->settings->id,
+			'id'     => 'my-account-' . buddypress()->settings->id . '-profile',
+			'title'  => __( 'Profile', 'buddypress' ),
+			'href'   => trailingslashit( $settings_link . 'profile' )
+		);
+
+		return $wp_admin_nav;
+	}
 }
 
 function bp_setup_xprofile() {