Index: admin_menu_toolbar/admin_menu_toolbar.css
===================================================================
RCS file: /cvs/drupal/contributions/modules/admin_menu/admin_menu_toolbar/admin_menu_toolbar.css,v
retrieving revision 1.7
diff -u -r1.7 admin_menu_toolbar.css
--- admin_menu_toolbar/admin_menu_toolbar.css	30 Jan 2011 03:40:54 -0000	1.7
+++ admin_menu_toolbar/admin_menu_toolbar.css	21 Feb 2011 05:15:05 -0000
@@ -138,6 +138,7 @@
   background: transparent none;
   opacity: 1;
   width: auto;
+  clear: both;
 }
 #admin-menu li.admin-menu-shortcuts ul li a {
   border-radius: 5px;
@@ -154,3 +155,6 @@
 #admin-menu li.admin-menu-shortcuts ul li a.active {
   background: url(toolbar.png) 0 -20px repeat-x;
 }
+#admin-menu li#edit-shortcuts {
+  float: right;
+}
Index: admin_menu_toolbar/admin_menu_toolbar.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/admin_menu/admin_menu_toolbar/admin_menu_toolbar.module,v
retrieving revision 1.4
diff -u -r1.4 admin_menu_toolbar.module
--- admin_menu_toolbar/admin_menu_toolbar.module	19 Feb 2010 23:19:00 -0000	1.4
+++ admin_menu_toolbar/admin_menu_toolbar.module	21 Feb 2011 05:15:05 -0000
@@ -62,6 +62,7 @@
     '#theme' => 'admin_menu_links',
     '#weight' => -200,
   );
+  
   $content['shortcuts']['shortcuts'] = array(
     '#title' => t('Show shortcuts'),
     // @todo How do we want to trigger/store state?
@@ -71,15 +72,34 @@
       'attributes' => array('class' => 'toggle'),
     ),
   );
-  // @todo *Move* this from $content['menu'] instead.
-  $content['shortcuts']['shortcuts']['node-add'] = array(
-    '#title' => t('Add content'),
-    '#href' => 'node/add',
-  );
-  $content['shortcuts']['shortcuts']['admin-content-node'] = array(
-    '#title' => t('Find content'),
-    '#href' => 'admin/content/node',
-    '#access' => user_access('administer nodes'),
-  );
+  
+  if( module_exists('shortcut')) {
+    $shortcut_set = shortcut_current_displayed_set();
+    $content['shortcuts']['shortcuts']['edit-shortcuts'] = array(
+      '#title' => t('Edit Shortcuts'),
+      '#href' => 'admin/config/user-interface/shortcut/' . $shortcut_set->set_name,
+      '#attributes' => array('id' => 'edit-shortcuts'),
+    );
+    // @todo flush cache whenever the default (or any?) shortcut set is changed instead of every time as below
+    admin_menu_flush_cache('menu');
+    foreach ($shortcut_set->links as $index => $link) {
+      $content['shortcuts']['shortcuts'][$link['link_path']] = array(
+        '#title' => $link['link_title'],
+        '#href' => $link['link_path'],
+        '#access' => TRUE,
+      );
+    }
+  }
+  else {
+    // @todo *Move* this from $content['menu'] instead.
+    $content['shortcuts']['shortcuts']['node-add'] = array(
+      '#title' => t('Add content'),
+      '#href' => 'node/add',
+    );
+    $content['shortcuts']['shortcuts']['admin-content-node'] = array(
+      '#title' => t('Find content'),
+      '#href' => 'admin/content/node',
+      '#access' => user_access('administer nodes'),
+    );
+  }
 }
-