diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index e49bb76..7829227 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -2315,18 +2315,6 @@ function template_preprocess_feed_icon(&$variables) {
 }
 
 /**
- * Returns HTML for a "more" link, like those used in blocks.
- *
- * @param $variables
- *   An associative array containing:
- *   - url: The URL of the main page.
- *   - title: A descriptive verb for the link, like 'Read more'.
- */
-function theme_more_link($variables) {
-  return '<div class="more-link">' . l(t('More'), $variables['url'], array('attributes' => array('title' => $variables['title']))) . '</div>';
-}
-
-/**
  * Returns HTML for an indentation div; used for drag and drop tables.
  *
  * @param $variables
@@ -3065,9 +3053,6 @@ function drupal_common_theme() {
       'variables' => array('url' => NULL, 'title' => NULL),
       'template' => 'feed-icon',
     ),
-    'more_link' => array(
-      'variables' => array('url' => NULL, 'title' => NULL)
-    ),
     'progress_bar' => array(
       'variables' => array('label' => NULL, 'percent' => NULL, 'message' => NULL),
       'template' => 'progress-bar',
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php
index eccd463..2543d35 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php
@@ -131,9 +131,9 @@ public function build() {
     if ($category = $this->categoryStorageController->load($cid)) {
       $result = $this->connection->queryRange('SELECT i.* FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON ci.iid = i.iid WHERE ci.cid = :cid ORDER BY i.timestamp DESC, i.iid DESC', 0, $this->configuration['block_count'], array(':cid' => $category->cid));
       $more_link = array(
-        '#theme' => 'more_link',
-        '#url' => 'aggregator/categories/' . $category->cid,
-        '#title' => t("View this category's recent news."),
+        '#type' => 'more_link',
+        '#href' => 'aggregator/categories/' . $category->cid,
+        '#attributes' => array('title' => t("View this category's recent news.")),
       );
       $read_more = drupal_render($more_link);
 
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
index 4fc69fe..0a125ba 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
@@ -133,9 +133,9 @@ public function build() {
     if ($feed = $this->storageController->load($this->configuration['feed'])) {
       $result = $this->connection->queryRange("SELECT * FROM {aggregator_item} WHERE fid = :fid ORDER BY timestamp DESC, iid DESC", 0, $this->configuration['block_count'], array(':fid' => $feed->id()));
       $more_link = array(
-        '#theme' => 'more_link',
-        '#url' => 'aggregator/sources/' . $feed->id(),
-        '#title' => t("View this feed's recent news."),
+        '#type' => 'more_link',
+        '#href' => 'aggregator/sources/' . $feed->id(),
+        '#attributes' => array('title' => t("View this feed's recent news.")),
       );
       $read_more = drupal_render($more_link);
       $items = array();
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 392e4b4..f4b9239 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -573,7 +573,11 @@ function forum_block_view_pre_render($elements) {
   $result = $elements['#query']->execute();
   if ($node_title_list = node_title_list($result)) {
     $elements['forum_list'] = $node_title_list;
-    $elements['forum_more'] = array('#theme' => 'more_link', '#url' => 'forum', '#title' => t('Read the latest forum topics.'));
+    $elements['forum_more'] = array(
+      '#type' => 'more_link',
+      '#href' => 'forum',
+      '#attributes' => array('title' => t('Read the latest forum topics.')),
+    );
   }
   return $elements;
 }
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 0ad789d..968f0b9 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -1171,9 +1171,9 @@ function theme_node_recent_block($variables) {
     $output = drupal_render($table);
     if (user_access('access content overview')) {
       $more_link = array(
-        '#theme' => 'more_link',
-        '#url' => 'admin/content',
-        '#title' => t('Show more content'),
+        '#type' => 'more_link',
+        '#href' => 'admin/content',
+        '#attributes' => array('title' => t('Show more content')),
       );
       $output .= drupal_render($more_link);
     }
diff --git a/core/modules/system/css/system.theme.css b/core/modules/system/css/system.theme.css
index c6ed012..b9454a2 100644
--- a/core/modules/system/css/system.theme.css
+++ b/core/modules/system/css/system.theme.css
@@ -119,7 +119,7 @@ abbr.form-required, abbr.tabledrag-changed, abbr.ajax-changed {
 }
 
 /**
- * Markup generated by theme_more_link().
+ * Markup generated by #type 'link'.
  */
 .more-link {
   text-align: right; /* LTR */
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 80b02f8..8fd0c96 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -538,6 +538,15 @@ function system_element_info() {
   $types['link'] = array(
     '#pre_render' => array('drupal_pre_render_link'),
   );
+  // A "more" link, like those used in blocks.
+  $types['more_link'] = $types['link'] + array(
+    '#title' => t('More'),
+    '#theme_wrappers' => array(
+      'container' => array(
+        '#attributes' => array('class' => 'more-link'),
+      ),
+    ),
+  );
   $types['fieldset'] = array(
     '#value' => NULL,
     '#process' => array('form_process_group', 'ajax_process_form'),
diff --git a/core/modules/system/tests/modules/theme_test/lib/Drupal/theme_test/EventSubscriber/ThemeTestSubscriber.php b/core/modules/system/tests/modules/theme_test/lib/Drupal/theme_test/EventSubscriber/ThemeTestSubscriber.php
index 56cbdaf..4ec3128 100644
--- a/core/modules/system/tests/modules/theme_test/lib/Drupal/theme_test/EventSubscriber/ThemeTestSubscriber.php
+++ b/core/modules/system/tests/modules/theme_test/lib/Drupal/theme_test/EventSubscriber/ThemeTestSubscriber.php
@@ -34,7 +34,7 @@ public function onRequest(GetResponseEvent $event) {
       // theme_test_request_listener_page_callback() to test that even when the
       // theme system is initialized this early, it is still capable of
       // returning output and theming the page as a whole.
-      $GLOBALS['theme_test_output'] = theme('more_link', array('url' => 'user', 'title' => 'Themed output generated in a KernelEvents::REQUEST listener'));
+      $GLOBALS['theme_test_output'] = theme('theme_test_foo', array('foo' => 'Themed output generated in a KernelEvents::REQUEST listener'));
     }
     if (strpos($current_path, 'user/autocomplete') === 0) {
       // Register a fake registry loading callback. If it gets called by