diff --git a/core/modules/shortcut/shortcut.base-rtl.css b/core/modules/shortcut/css/shortcut.module-rtl.css
similarity index 100%
rename from core/modules/shortcut/shortcut.base-rtl.css
rename to core/modules/shortcut/css/shortcut.module-rtl.css
diff --git a/core/modules/shortcut/shortcut.base.css b/core/modules/shortcut/css/shortcut.module.css
similarity index 100%
rename from core/modules/shortcut/shortcut.base.css
rename to core/modules/shortcut/css/shortcut.module.css
diff --git a/core/modules/shortcut/shortcut.theme-rtl.css b/core/modules/shortcut/css/shortcut.theme-rtl.css
similarity index 100%
rename from core/modules/shortcut/shortcut.theme-rtl.css
rename to core/modules/shortcut/css/shortcut.theme-rtl.css
diff --git a/core/modules/shortcut/shortcut.theme.css b/core/modules/shortcut/css/shortcut.theme.css
similarity index 83%
rename from core/modules/shortcut/shortcut.theme.css
rename to core/modules/shortcut/css/shortcut.theme.css
index 04f7c9f..2a1a6ab 100644
--- a/core/modules/shortcut/shortcut.theme.css
+++ b/core/modules/shortcut/css/shortcut.theme.css
@@ -7,11 +7,11 @@
  * Toolbar.
  */
 .icon-shortcut:before {
-  background-image: url("images/shortcut.png");
+  background-image: url("../images/shortcut.png");
 }
 .icon-shortcut:active:before,
 .icon-shortcut.active:before {
-  background-image: url("images/shortcut-active.png");
+  background-image: url("../images/shortcut-active.png");
 }
 .toolbar .tray.horizontal.shortcuts .menu {
   float: left;
@@ -31,7 +31,7 @@
  * Add/remove links.
  */
 .add-or-remove-shortcuts .icon {
-  background: transparent url(shortcut.png) no-repeat;
+  background: transparent url(../shortcut.png) no-repeat;
   height: 12px;
   margin-left: 8px; /* LTR */
   overflow: hidden;
diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index db3373b..2aee4a9 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -507,8 +507,8 @@ function shortcut_preprocess_page(&$variables) {
       $variables['title_suffix']['add_or_remove_shortcut'] = array(
         '#attached' => array(
           'css' => array(
-            drupal_get_path('module', 'shortcut') . '/shortcut.base.css',
-            drupal_get_path('module', 'shortcut') . '/shortcut.theme.css',
+            drupal_get_path('module', 'shortcut') . '/css/shortcut.module.css',
+            drupal_get_path('module', 'shortcut') . '/css/shortcut.theme.css',
           ),
         ),
         '#prefix' => '<div class="add-or-remove-shortcuts ' . $link_mode . '-shortcut">',
@@ -560,8 +560,8 @@ function shortcut_toolbar() {
       '#weight' => -10,
       '#attached' => array(
         'css' => array(
-          drupal_get_path('module', 'shortcut') . '/shortcut.base.css',
-          drupal_get_path('module', 'shortcut') . '/shortcut.theme.css',
+          drupal_get_path('module', 'shortcut') . '/css/shortcut.module.css',
+          drupal_get_path('module', 'shortcut') . '/css/shortcut.theme.css',
         ),
       ),
     );