diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 009d07e..4dccead 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -2266,7 +2266,7 @@ function theme_tablesort_indicator($variables) {
  *     MARK_UPDATED, MARK_READ.
  */
 function theme_mark($variables) {
-  $type = $variables['type'];
+  $type = $variables['mark_type'];
   global $user;
   if ($user->uid) {
     if ($type == MARK_NEW) {
@@ -3203,7 +3203,7 @@ function drupal_common_theme() {
       'variables' => array('style' => NULL),
     ),
     'mark' => array(
-      'variables' => array('type' => MARK_NEW),
+      'variables' => array('mark_type' => MARK_NEW),
     ),
     'item_list' => array(
       'variables' => array('items' => array(), 'title' => '', 'type' => 'ul', 'attributes' => array()),
diff --git a/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php b/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php
index 4465dac..fbd6b0b 100644
--- a/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php
+++ b/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php
@@ -90,7 +90,7 @@ function render($values) {
       elseif ($last_comment > $last_read && $last_comment > HISTORY_READ_LIMIT) {
         $mark = MARK_UPDATED;
       }
-      return $this->render_link(theme('mark', array('type' => $mark)), $values);
+      return $this->render_link(theme('mark', array('mark_type' => $mark)), $values);
     }
   }
 
diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc
index 39b54f1..227b284 100644
--- a/core/modules/node/node.admin.inc
+++ b/core/modules/node/node.admin.inc
@@ -542,7 +542,7 @@ function node_admin_nodes() {
       '#title' => $node->label(),
       '#href' => 'node/' . $node->nid,
       '#options' => $l_options,
-      '#suffix' => ' ' . theme('mark', array('type' => node_mark($node->nid, $node->changed))),
+      '#suffix' => ' ' . theme('mark', array('mark_type' => node_mark($node->nid, $node->changed))),
     );
     $form['nodes'][$node->nid]['type'] = array(
       '#markup' => check_plain(node_get_type_label($node)),
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index d4cd961..1d2de3d 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -1916,7 +1916,7 @@ function theme_node_recent_content($variables) {
 
   $output = '<div class="node-title">';
   $output .= l($node->label(), 'node/' . $node->nid);
-  $output .= theme('mark', array('type' => node_mark($node->nid, $node->changed)));
+  $output .= theme('mark', array('mark_type' => node_mark($node->nid, $node->changed)));
   $output .= '</div><div class="node-author">';
   $output .= theme('username', array('account' => user_load($node->uid)));
   $output .= '</div>';
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index db6ecc1..5fd1827 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -293,6 +293,9 @@ function system_element_info() {
     '#group_callback' => 'drupal_group_js',
     '#aggregate_callback' => 'drupal_aggregate_js',
   );
+  $types['mark'] = array(
+    '#theme' => 'mark',
+  );
 
   // Input elements.
   $types['submit'] = array(
diff --git a/core/modules/tracker/tracker.pages.inc b/core/modules/tracker/tracker.pages.inc
index be5302e..93c39fb 100644
--- a/core/modules/tracker/tracker.pages.inc
+++ b/core/modules/tracker/tracker.pages.inc
@@ -77,7 +77,7 @@ function tracker_page($account = NULL, $set_title = FALSE) {
       $row = array(
         'type' => check_plain(node_get_type_label($node)),
         // Do not use $node->label(), because $node comes from the database.
-        'title' => array('data' => l($node->title, 'node/' . $node->nid) . ' ' . theme('mark', array('type' => node_mark($node->nid, $node->changed)))),
+        'title' => array('data' => l($node->title, 'node/' . $node->nid) . ' ' . theme('mark', array('mark_type' => node_mark($node->nid, $node->changed)))),
         'author' => array('data' => theme('username', array('account' => $node))),
         'replies' => array('class' => array('replies'), 'data' => $comments),
         'last updated' => array('data' => t('!time ago', array('!time' => format_interval(REQUEST_TIME - $node->last_activity)))),