diff --git a/modules/node/node.admin.css b/modules/node/node.admin.css
new file mode 100644
index 0000000..3a3d2aa
--- /dev/null
+++ b/modules/node/node.admin.css
@@ -0,0 +1,8 @@
+
+.node-preview {
+  background-color: #ffffea;
+}
+
+td.revision-current {
+  background: #ffc;
+}
diff --git a/modules/node/node.css b/modules/node/node.css
deleted file mode 100644
index 07540fa..0000000
--- a/modules/node/node.css
+++ /dev/null
@@ -1,10 +0,0 @@
-
-.node-unpublished {
-  background-color: #fff4f4;
-}
-.preview .node {
-  background-color: #ffffea;
-}
-td.revision-current {
-  background: #ffc;
-}
diff --git a/modules/node/node.info b/modules/node/node.info
index 2e410ed..ff6f13c 100644
--- a/modules/node/node.info
+++ b/modules/node/node.info
@@ -8,4 +8,3 @@ files[] = node.test
 required = TRUE
 dependencies[] = entity
 configure = admin/structure/types
-stylesheets[all][] = node.css
diff --git a/modules/node/node.module b/modules/node/node.module
index 0c3cfb7..73cf88c 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1485,7 +1485,7 @@ function template_preprocess_node(&$variables) {
     $variables['classes_array'][] = 'node-sticky';
   }
   if (!$variables['status']) {
-    $variables['classes_array'][] = 'node-unpublished';
+    $variables['classes_array'][] = 'unpublished';
   }
   if ($variables['teaser']) {
     $variables['classes_array'][] = 'node-teaser';
diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc
index c7b26e7..a9573e1 100644
--- a/modules/node/node.pages.inc
+++ b/modules/node/node.pages.inc
@@ -374,6 +374,9 @@ function node_preview($node) {
 function theme_node_preview($variables) {
   $node = $variables['node'];
 
+  // Add the required css.
+  drupal_add_css(drupal_get_path('module', 'node') . '/node.admin.css');
+    
   $output = '<div class="preview">';
 
   $preview_trimmed_version = FALSE;
@@ -539,6 +542,9 @@ function node_revision_overview($node) {
     '#theme' => 'table',
     '#rows' => $rows,
     '#header' => $header,
+    '#attached' => array (
+      'css' => array(drupal_get_path('module', 'node') . '/node.admin.css'),
+    ),
   );
 
   return $build;
diff --git a/modules/node/node.tpl.php b/modules/node/node.tpl.php
index 06dc199..69dc533 100644
--- a/modules/node/node.tpl.php
+++ b/modules/node/node.tpl.php
@@ -32,7 +32,7 @@
  *   - node-promoted: Nodes promoted to the front page.
  *   - node-sticky: Nodes ordered above other non-sticky nodes in teaser
  *     listings.
- *   - node-unpublished: Unpublished nodes visible only to administrators.
+ *   - unpublished: Unpublished nodes visible only to administrators.
  * - $title_prefix (array): An array containing additional output populated by
  *   modules, intended to be displayed in front of the main title tag that
  *   appears in the template.
diff --git a/modules/simpletest/tests/common_test.module b/modules/simpletest/tests/common_test.module
index a3bb9b0..9c12c48 100644
--- a/modules/simpletest/tests/common_test.module
+++ b/modules/simpletest/tests/common_test.module
@@ -242,7 +242,7 @@ function common_test_library_info() {
  */
 function common_test_js_and_css_querystring() {
    drupal_add_js(drupal_get_path('module', 'node') . '/node.js');
-   drupal_add_css(drupal_get_path('module', 'node') . '/node.css');
+   drupal_add_css(drupal_get_path('module', 'node') . '/node.admin.css');
    // A relative URI may have a query string.
    drupal_add_css('/' . drupal_get_path('module', 'node') . '/node-fake.css?arg1=value1&arg2=value2');
    return '';
diff --git a/modules/system/system.theme.css b/modules/system/system.theme.css
index f34a965..d6e7629 100644
--- a/modules/system/system.theme.css
+++ b/modules/system/system.theme.css
@@ -38,6 +38,13 @@ tr.odd {
 }
 
 /**
+ * Publishing options.
+ */
+.unpublished {
+  background-color: #fff4f4;
+}
+
+/**
  * Markup generated by theme_tablesort_indicator().
  */
 th.active img {
diff --git a/themes/bartik/css/style.css b/themes/bartik/css/style.css
index 4fb8210..7c94fb8 100644
--- a/themes/bartik/css/style.css
+++ b/themes/bartik/css/style.css
@@ -658,11 +658,11 @@ ul.links {
   color: #68696b;
   font-size: 0.821em;
 }
-.node-unpublished {
+.unpublished {
   margin: -20px -15px 0;
   padding: 20px 15px 0;
 }
-.node-unpublished .comment-text .comment-arrow {
+.unpublished .comment-text .comment-arrow {
   border-left: 1px solid #fff4f4;
   border-right: 1px solid #fff4f4;
 }
diff --git a/themes/bartik/templates/node.tpl.php b/themes/bartik/templates/node.tpl.php
index 234b899..9984cf9 100644
--- a/themes/bartik/templates/node.tpl.php
+++ b/themes/bartik/templates/node.tpl.php
@@ -32,7 +32,7 @@
  *   - node-promoted: Nodes promoted to the front page.
  *   - node-sticky: Nodes ordered above other non-sticky nodes in teaser
  *     listings.
- *   - node-unpublished: Unpublished nodes visible only to administrators.
+ *   - unpublished: Unpublished nodes visible only to administrators.
  * - $title_prefix (array): An array containing additional output populated by
  *   modules, intended to be displayed in front of the main title tag that
  *   appears in the template.