diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 89cdc53..a89198f 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -48,6 +48,11 @@
  */
 const MARK_UPDATED = 2;
 
+ /**
+ * Mark content as being updated.
+ */
+const MARK_UNPUBLISHED = 3;
+
 /**
  * A responsive table class; hide table cell on narrow devices.
  *
@@ -1715,6 +1720,24 @@ function template_preprocess_tablesort_indicator(&$variables) {
   }
 }
 
+function theme_mark($variables) {
+  $type = $variables['status'];
+  if (\Drupal::currentUser()->isAuthenticated()) {
+    if ($type == MARK_NEW) {
+      $mark_text = t('new');
+    }
+    elseif ($type == MARK_UPDATED) {
+      $mark_text = t('updated');
+    }
+    elseif ($type == MARK_UNPUBLISHED) {
+      $mark_text = t('unpublished');
+    }
+  }
+  if (!empty($mark_text)) {
+    return ' <span class="marker">' . $mark_text . '</span>';
+  }
+}
+
 /**
  * Prepares variables for item list templates.
  *
diff --git a/core/themes/bartik/bartik.theme b/core/themes/bartik/bartik.theme
index 836a8f7..461fa96 100644
--- a/core/themes/bartik/bartik.theme
+++ b/core/themes/bartik/bartik.theme
@@ -90,6 +90,17 @@ 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') {
+     $variables['unpublished'] = theme('mark', (array('type' => MARK_UNPUBLISHED)));
+   }
+ }
+
 /**
  * Implements hook_preprocess_HOOK() for maintenance-page.html.twig.
  */
@@ -125,6 +136,12 @@ 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'])) {
+    $variables['unpublished'] = theme('mark', (array('type' => MARK_UNPUBLISHED)));
+  }
 }
 
 /**
diff --git a/core/themes/bartik/templates/comment.html.twig b/core/themes/bartik/templates/comment.html.twig
index c00a9c5..332e36a 100644
--- a/core/themes/bartik/templates/comment.html.twig
+++ b/core/themes/bartik/templates/comment.html.twig
@@ -65,6 +65,7 @@
 <article class="{{ attributes.class }} clearfix" role="article"{{ attributes|without('class', 'role') }}>
 
   <header class="comment-header">
+  {{ unpublished }}
     <div class="attribution">
       {{ user_picture }}
 
diff --git a/core/themes/bartik/templates/node.html.twig b/core/themes/bartik/templates/node.html.twig
index d45b0f0..c8e7075 100644
--- a/core/themes/bartik/templates/node.html.twig
+++ b/core/themes/bartik/templates/node.html.twig
@@ -81,6 +81,7 @@
       </h2>
     {% endif %}
     {{ title_suffix }}
+    {{ unpublished }}
 
     {% if display_submitted %}
       <div class="node__meta">