diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index dfee854..eda8692 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -49,6 +49,11 @@
  */
 const MARK_UPDATED = 2;
 
+ /**
+ * Mark content as being updated.
+ */
+const MARK_UNPUBLISHED = 3;
+
 /**
  * A responsive table class; hide table cell on narrow devices.
  *
@@ -1762,6 +1767,7 @@ function drupal_common_theme() {
     ),
     'mark' => array(
       'variables' => array('status' => MARK_NEW),
+      'template' => 'mark',
     ),
     'item_list' => array(
       'variables' => array('items' => array(), 'title' => '', 'list_type' => 'ul', 'attributes' => array(), 'empty' => NULL),
diff --git a/core/modules/comment/css/comment.theme.css b/core/modules/comment/css/comment.theme.css
index c702161..318f478 100644
--- a/core/modules/comment/css/comment.theme.css
+++ b/core/modules/comment/css/comment.theme.css
@@ -14,3 +14,17 @@
   margin-left: 0;
   margin-right: 25px;
 }
+
+.comment-unpublished div.unpublished {
+  height: 0;
+  overflow: visible;
+  color: #d8d8d8;
+  font-size: 4em;
+  line-height: 1;
+  font-weight: bold;
+  text-transform: uppercase;
+  text-align: center;
+}
+.preview .comment div.unpublished {
+  display: none;
+}
\ No newline at end of file
diff --git a/core/modules/system/css/system.theme.css b/core/modules/system/css/system.theme.css
index f7af1e4..8150b5f 100644
--- a/core/modules/system/css/system.theme.css
+++ b/core/modules/system/css/system.theme.css
@@ -8,6 +8,30 @@
  */
 .node--unpublished {
   background-color: #fff4f4;
+  box-shadow: 0 -8px 0 #d8d8d8;
+  z-index: 0;
+}
+.node-preview div.unpublished {
+  display: none;
+}
+.preview .comment div.unpublished {
+  display: none;
+}
+.marker {
+    color: #d8d8d8;
+    font-family: Impact,"Arial Narrow",Helvetica,sans-serif;
+    font-size: 75px;
+    font-weight: bold;
+    height: 0;
+    line-height: 1;
+    overflow: visible;
+    text-transform: uppercase;
+    word-wrap: break-word;
+    float: right;
+    position: relative;
+    left: -50%;
+    text-align: left;
+    z-index: -1;
 }
 
 /**
@@ -76,9 +100,6 @@ label.option {
 .form-type-checkbox .description {
   margin-left: 2.4em;
 }
-.marker {
-  color: #e00;
-}
 
 .form-required:after {
   content: '';
diff --git a/core/modules/system/templates/mark.html.twig b/core/modules/system/templates/mark.html.twig
index 1697de3..e4d3f03 100644
--- a/core/modules/system/templates/mark.html.twig
+++ b/core/modules/system/templates/mark.html.twig
@@ -9,6 +9,7 @@
  *   - MARK_NEW
  *   - MARK_UPDATED
  *   - MARK_READ
+ *   - MARK_UNPUBLISHED
  *
  * @ingroup themeable
  */
@@ -18,5 +19,7 @@
     <span>{{ 'new'|t }}</span>
   {% elseif status is constant('MARK_UPDATED') %}
     <span>{{ 'updated'|t }}</span>
+  {% elseif status is constant('MARK_UNPUBLISHED') %}
+    <span>{{ 'unpublished'|t }}</span>
   {% endif %}
 {% endif %}
diff --git a/core/themes/bartik/bartik.theme b/core/themes/bartik/bartik.theme
index 1f69448..3138069 100644
--- a/core/themes/bartik/bartik.theme
+++ b/core/themes/bartik/bartik.theme
@@ -62,6 +62,21 @@ function bartik_preprocess_page(&$variables) {
   }
 }
 
+ /**
+  * Implements hook_process_HOOK() for comment.html.twig.
+  *
+  * Override or insert variables into the comment template.
+  */
+ function bartik_preprocess_comment(&$variables) {
+   if ($variables['status'] == 'unpublished') {
+     $mark_build = array(
+       '#theme' => 'mark',
+       '#status' => MARK_UNPUBLISHED,
+     );
+     $variables['unpublished'] = drupal_render($mark_build);
+   }
+ }
+
 /**
  * Implements hook_preprocess_HOOK() for maintenance-page.html.twig.
  */
@@ -90,6 +105,16 @@ function bartik_preprocess_node(&$variables) {
   if ($variables['teaser'] || !empty($variables['content']['comments']['comment_form'])) {
     unset($variables['content']['links']['comment']['#links']['comment-add']);
   }
+
+  $status = (isset($variables['status'])) ? $variables['status'] : 0;
+  // Add an unpublished mark to unpublished nodes.
+  if (!$status && !isset($variables['preview'])) {
+    $mark_build = array(
+      '#theme' => 'mark',
+      '#status' => MARK_UNPUBLISHED,
+    );
+    $variables['unpublished'] = drupal_render($mark_build);
+  }
 }
 
 /**
diff --git a/core/themes/bartik/templates/comment.html.twig b/core/themes/bartik/templates/comment.html.twig
index 21cca3c..40dd6cd 100644
--- a/core/themes/bartik/templates/comment.html.twig
+++ b/core/themes/bartik/templates/comment.html.twig
@@ -74,6 +74,7 @@
 %}
 <article role="article"{{ attributes.addClass(classes)|without('role') }}>
   <header class="comment-header">
+    {{ unpublished }}
     <div class="comment__attribution">
       {{ user_picture }}
       <div class="comment__submitted">
diff --git a/core/themes/bartik/templates/node.html.twig b/core/themes/bartik/templates/node.html.twig
index 36ad9a7..0f12f60 100644
--- a/core/themes/bartik/templates/node.html.twig
+++ b/core/themes/bartik/templates/node.html.twig
@@ -82,6 +82,8 @@
       </h2>
     {% endif %}
     {{ title_suffix }}
+    {{ unpublished }}
+
     {% if display_submitted %}
       <div class="node__meta">
         {{ author_picture }}