diff --git a/core/modules/dashboard/dashboard.module b/core/modules/dashboard/dashboard.module
index 1464576..5dad389 100644
--- a/core/modules/dashboard/dashboard.module
+++ b/core/modules/dashboard/dashboard.module
@@ -40,6 +40,7 @@ function dashboard_menu() {
     'description' => 'View and customize your dashboard.',
     'page callback' => 'dashboard_admin',
     'access arguments' => array('access dashboard'),
+    'menu_name' => 'management',
     // Make this appear first, so for example, in admin menus, it shows up on
     // the top corner of the window as a convenient "home link".
     'weight' => -15,
diff --git a/core/modules/help/help.module b/core/modules/help/help.module
index dbc836c..f39158d 100644
--- a/core/modules/help/help.module
+++ b/core/modules/help/help.module
@@ -14,6 +14,7 @@ function help_menu() {
     'description' => 'Reference for usage, configuration, and modules.',
     'page callback' => 'help_main',
     'access arguments' => array('access administration pages'),
+    'menu_name' => 'management',
     'weight' => 9,
     'file' => 'help.admin.inc',
   );
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 287c5af..6dd6474 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -1851,6 +1851,7 @@ function node_menu() {
     'page callback' => 'drupal_get_form',
     'page arguments' => array('node_admin_content'),
     'access arguments' => array('access content overview'),
+    'menu_name' => 'management',
     'weight' => -10,
     'file' => 'node.admin.inc',
   );
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index b32187a..f1ef860 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -621,7 +621,6 @@ function system_menu() {
     'access arguments' => array('access administration pages'),
     'page callback' => 'system_admin_menu_block_page',
     'weight' => 9,
-    'menu_name' => 'management',
     'file' => 'system.admin.inc',
   );
   $items['admin/compact'] = array(
@@ -649,6 +648,7 @@ function system_menu() {
   $items['admin/structure'] = array(
     'title' => 'Structure',
     'description' => 'Administer blocks, content types, menus, etc.',
+    'menu_name' => 'management',
     'position' => 'right',
     'weight' => -8,
     'page callback' => 'system_admin_menu_block_page',
@@ -661,6 +661,7 @@ function system_menu() {
     'description' => 'Select and configure your themes.',
     'page callback' => 'system_themes_page',
     'access arguments' => array('administer themes'),
+    'menu_name' => 'management',
     'position' => 'left',
     'weight' => -6,
     'file' => 'system.admin.inc',
@@ -728,6 +729,7 @@ function system_menu() {
     'page callback' => 'drupal_get_form',
     'page arguments' => array('system_modules'),
     'access arguments' => array('administer modules'),
+    'menu_name' => 'management',
     'file' => 'system.admin.inc',
     'weight' => -2,
   );
@@ -1078,6 +1080,7 @@ function system_menu() {
     'description' => 'View reports, updates, and errors.',
     'page callback' => 'system_admin_menu_block_page',
     'access arguments' => array('access site reports'),
+    'menu_name' => 'management',
     'weight' => 5,
     'position' => 'left',
     'file' => 'system.admin.inc',
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index 904a2f8..15dc4d0 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -286,17 +286,8 @@ function toolbar_view() {
  * @return
  *   An array containing a menu tree of top level items below the 'admin' path.
  */
-function toolbar_get_menu_tree() {
-  $tree = array();
-  $admin_link = db_query('SELECT * FROM {menu_links} WHERE menu_name = :menu_name AND module = :module AND link_path = :path', array(':menu_name' => 'management', ':module' => 'system', ':path' => 'admin'))->fetchAssoc();
-  if ($admin_link) {
-    $tree = menu_build_tree('management', array(
-      'expanded' => array($admin_link['mlid']),
-      'min_depth' => $admin_link['depth'] + 1,
-      'max_depth' => $admin_link['depth'] + 1,
-    ));
-  }
-
+function toolbar_get_menu_tree($menu_name = 'management') {
+  $tree = menu_tree_all_data($menu_name, NULL, 1);
   return $tree;
 }
 
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 1e7aa99..6b5b3e9 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1536,6 +1536,7 @@ function user_menu() {
     'page callback' => 'user_admin',
     'page arguments' => array('list'),
     'access arguments' => array('administer users'),
+    'menu_name' => 'management',
     'position' => 'left',
     'weight' => -4,
     'file' => 'user.admin.inc',