Index: modules/shortcut/shortcut.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/shortcut/shortcut.module,v
retrieving revision 1.27
diff -u -p -r1.27 shortcut.module
--- modules/shortcut/shortcut.module	24 Sep 2010 00:37:44 -0000	1.27
+++ modules/shortcut/shortcut.module	12 Dec 2010 19:41:54 -0000
@@ -30,7 +30,7 @@ function shortcut_help($path, $arg) {
       $output .= '<dt>' . t('Choosing shortcut sets') . '</dt>';
       $output .= '<dd>' . t('Users with permission to switch shortcut sets can choose a shortcut set to use from the Shortcuts tab of their user account page.') . '</dd>';
       $output .= '<dt>' . t('Adding and removing shortcuts') . '</dt>';
-      $output .= '<dd>' . t('The Shortcut module creates an add/remove link for each page on your site; the link lets you add or remove the current page from the currently-enabled set of shortcuts (if your theme displays it and you have permission to edit your shortcut set). The core Seven administration theme displays this link next to the page title, as a small + or - sign. If you click on the + sign, you will add that page to your preferred set of shortcuts. If the page is already part of your shortcut set, the link will be a - sign, and will allow you to remove the current page from your shortcut set.') . '</dd>';
+      $output .= '<dd>' . t('The Shortcut module creates an add/remove link for each administrative page on your site; the link lets you add or remove the current page from the currently-enabled set of shortcuts (if your theme displays it and you have permission to edit your shortcut set). For example, the core Seven administration theme displays this link next to the page title, as a small + or - sign. If you click on the + sign, you will add that page to your preferred set of shortcuts. If the page is already part of your shortcut set, the link will be a - sign, and will allow you to remove the current page from your shortcut set.') . '</dd>';
       $output .= '<dt>' . t('Displaying shortcuts') . '</dt>';
       $output .= '<dd>' . t('You can display your shortcuts by enabling the Shortcuts block on the <a href="@blocks">Blocks administration page</a>. Certain administrative modules also display your shortcuts; for example, the core <a href="@toolbar-help">Toolbar module</a> displays them near the top of the page, along with an <em>Edit shortcuts</em> link.', array('@blocks' => url('admin/structure/block'), '@toolbar-help' => url('admin/help/toolbar'))) . '</dd>';
       $output .= '</dl>';
@@ -678,7 +678,7 @@ function shortcut_preprocess_page(&$vari
       $link_path = 'admin/config/user-interface/shortcut/link/' . $mlid . '/delete';
     }
 
-    if (theme_get_setting('shortcut_module_link')) {
+    if (theme_get_setting('shortcut_module_link') && path_is_admin(current_path())) {
       $variables['title_suffix']['add_or_remove_shortcut'] = array(
         '#attached' => array('css' => array(drupal_get_path('module', 'shortcut') . '/shortcut.css')),
         '#prefix' => '<div class="add-or-remove-shortcuts ' . $link_mode . '-shortcut">',
Index: themes/bartik/bartik.info
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/bartik.info,v
retrieving revision 1.5
diff -u -p -r1.5 bartik.info
--- themes/bartik/bartik.info	7 Nov 2010 00:27:20 -0000	1.5
+++ themes/bartik/bartik.info	12 Dec 2010 19:41:54 -0000
@@ -32,5 +32,5 @@ regions[footer_thirdcolumn] = Footer thi
 regions[footer_fourthcolumn] = Footer fourth column
 regions[footer] = Footer
 
-settings[shortcut_module_link] = 0
+settings[shortcut_module_link] = 1
 
Index: themes/bartik/css/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/css/style.css,v
retrieving revision 1.47
diff -u -p -r1.47 style.css
--- themes/bartik/css/style.css	9 Dec 2010 07:48:35 -0000	1.47
+++ themes/bartik/css/style.css	12 Dec 2010 19:41:54 -0000
@@ -1446,10 +1446,10 @@ ol.search-results {
   margin: 0;
 }
 div.add-or-remove-shortcuts {
-  padding-top: 0.9em;
+  padding-top: 0.6em;
 }
-.overlay div.add-or-remove-shortcuts {
-  padding-top: 0.8em;
+#overlay-titlebar div.add-or-remove-shortcuts {
+  padding-top: 1.15em;
 }
 
 /* ---------- Admin-specific Theming ---------- */