diff --git a/core/includes/pager.inc b/core/includes/pager.inc
index 780ff6f..b653209 100644
--- a/core/includes/pager.inc
+++ b/core/includes/pager.inc
@@ -175,23 +175,13 @@ function template_preprocess_pager(&$variables) {
   $element = $variables['element'];
   $parameters = $variables['parameters'];
   $quantity = $variables['quantity'];
-  global $pager_page_array, $pager_total;
+  global $pager_page_array, $pager_total, $base_url;
 
   // Nothing to do if there is only one page.
   if ($pager_total[$element] <= 1) {
     return;
   }
 
-  // Fill in default link labels.
-  $tags = &$variables['tags'];
-  $tags += array(
-    t('« first'),
-    t('‹ previous'),
-    '',
-    t('next ›'),
-    t('last »'),
-  );
-
   // Calculate various markers within this pager piece:
   // Middle is used to "center" pages around the current page.
   $pager_middle = ceil($quantity / 2);
@@ -224,192 +214,59 @@ function template_preprocess_pager(&$variables) {
   $li_next = '';
   $li_last = '';
   $current_path = current_path();
-
-  // Create the "first" and "previous" links if we are not on the first page.
-  if ($pager_page_array[$element] > 0) {
-    $li_first = array(
-      '#type' => 'link',
-      '#title' => $tags[0],
-      '#href' => $current_path,
-      '#options' => array(
-        'query' => pager_query_add_page($parameters, $element, 0),
-        'attributes' => array(
-          'title' => t('Go to first page'),
-          'rel' => 'first',
-        ),
-        // Below is ignored by default, supplied to support hook_link_alter
-        // implementations.
-        'pager_context' => array(
-          'link_type' => 'first',
-          'element' => $element,
-        ),
-      ),
-    );
-    $li_previous = array(
-      '#type' => 'link',
-      '#title' => $tags[1],
-      '#href' => $current_path,
-      '#options' => array(
-        'query' => pager_query_add_page($parameters, $element, $pager_page_array[$element] - 1),
-        'attributes' => array(
-          'title' => t('Go to previous page'),
-          'rel' => 'prev',
-        ),
-        // Below is ignored by default, supplied to support hook_link_alter
-        // implementations.
-        'pager_context' => array(
-          'link_type' => 'previous',
-          'element' => $element,
-        ),
-      ),
-    );
-  }
-
-  // Create the "last" and "next" links if we are not on the last page.
-  if ($pager_page_array[$element] < ($pager_total[$element] - 1)) {
-    $li_next = array(
-      '#type' => 'link',
-      '#title' => $tags[3],
-      '#href' => $current_path,
-      '#options' => array(
-        'query' => pager_query_add_page($parameters, $element, $pager_page_array[$element] + 1),
-        'attributes' => array(
-          'title' => t('Go to next page'),
-          'rel' => 'next',
-        ),
-        // Below is ignored by default, supplied to support hook_link_alter
-        // implementations.
-        'pager_context' => array(
-          'link_type' => 'next',
-          'element' => $element,
-        ),
-      ),
-    );
-    $li_last = array(
-      '#type' => 'link',
-      '#title' => $tags[4],
-      '#href' => $current_path,
-      '#options' => array(
-        'query' => pager_query_add_page($parameters, $element, $pager_total[$element] - 1),
-        'attributes' => array(
-          'title' => t('Go to last page'),
-          'rel' => 'last',
-        ),
-        // Below is ignored by default, supplied to support hook_link_alter
-        // implementations.
-        'pager_context' => array(
-          'link_type' => 'last',
-          'element' => $element,
-        ),
-      ),
-    );
-  }
+  $ellipsis = array();
 
   if ($pager_total[$element] > 1) {
-    if ($li_first) {
-      $items[] = array(
-        '#wrapper_attributes' => array('class' => array('pager-first')),
-        'link' => $li_first,
-      );
-    }
-    if ($li_previous) {
-      $items[] = array(
-        '#wrapper_attributes' => array('class' => array('pager-previous')),
-        'link' => $li_previous,
-      );
+    // Create the "first" and "previous" links if we are not on the first page.
+    if ($pager_page_array[$element] > 0) {
+      $items['first'] = true;
+      $li_previous = pager_query_add_page($parameters, $element, $pager_page_array[$element] - 1);
+      
+      if ($li_previous && isset($li_previous['page'])) {
+        $items['previous'] = $li_previous['page']; 
+      }
     }
 
     // When there is more than one page, create the pager list.
     if ($i != $pager_max) {
       // Check whether there are further previous pages.
       if ($i > 1) {
-        $items[] = array(
-          '#wrapper_attributes' => array('class' => array('pager-ellipsis')),
-          '#markup' => '…',
-        );
+        $ellipsis['prev'] = true;
       }
+      
       // Now generate the actual pager piece.
       for (; $i <= $pager_last && $i <= $pager_max; $i++) {
-        if ($i < $pager_current) {
-          $items[] = array(
-            '#wrapper_attributes' => array('class' => array('pager-item')),
-            'link' => array(
-              '#type' => 'link',
-              '#title' => $i,
-              '#href' => $current_path,
-              '#options' => array(
-                'query' => pager_query_add_page($parameters, $element, $i - 1),
-                'attributes' => array(
-                  'title' => t('Go to page @number', array('@number' => $i)),
-                ),
-                // Below is ignored by default, supplied to support hook_link_alter
-                // implementations.
-                'pager_context' => array(
-                  'link_type' => 'item',
-                  'element' => $element,
-                  'interval' => ($pager_current - $i),
-                ),
-              ),
-            ),
-          );
-        }
-        if ($i == $pager_current) {
-          $items[] = array(
-            '#wrapper_attributes' => array('class' => array('pager-current')),
-            '#markup' => $i,
-          );
-        }
-        if ($i > $pager_current) {
-          $items[] = array(
-            '#wrapper_attributes' => array('class' => array('pager-item')),
-            'link' => array(
-              '#type' => 'link',
-              '#title' => $i,
-              '#href' => $current_path,
-              '#options' => array(
-                'query' => pager_query_add_page($parameters, $element, $i - 1),
-                'attributes' => array(
-                  'title' => t('Go to page @number', array('@number' => $i)),
-                ),
-                // Below is ignored by default, supplied to support hook_link_alter
-                // implementations.
-                'pager_context' => array(
-                  'link_type' => 'item',
-                  'element' => $element,
-                  'interval' => ($i - $pager_current),
-                ),
-              ),
-            ),
-          );
+        $query = pager_query_add_page($parameters, $element, $i);
+        if (isset($query['page'])) {
+          $items['pages'][$i-1] = $query['page'];
         }
       }
+      
       // Check whether there are further next pages.
       if ($i < $pager_max) {
-        $items[] = array(
-          '#wrapper_attributes' => array('class' => array('pager-ellipsis')),
-          '#markup' => '…',
-        );
+        $ellipsis['next'] = true;
       }
     }
-    // End generation.
-    if ($li_next) {
-      $items[] = array(
-        '#wrapper_attributes' => array('class' => array('pager-next')),
-        'link' => $li_next,
-      );
-    }
-    if ($li_last) {
-      $items[] = array(
-        '#wrapper_attributes' => array('class' => array('pager-last')),
-        'link' => $li_last,
-      );
+        
+    // Create the "last" and "next" links if we are not on the last page.
+    if ($pager_page_array[$element] < ($pager_total[$element] - 1)) {
+      $li_next = pager_query_add_page($parameters, $element, $pager_page_array[$element] + 1);
+      $li_last = pager_query_add_page($parameters, $element, $pager_total[$element] - 1);
+      
+      // End generation.
+      if ($li_next) {
+        $items['next'] = $li_next['page'];
+      }
+      if ($li_last) {
+        $items['last'] = $li_last['page'];
+      }
     }
-
-    $variables['items'] = array(
-      '#theme' => 'item_list__pager',
-      '#items' => $items,
-      '#attributes' => array('class' => array('pager')),
-    );
+    
+    // If there is a better way to generate the URL, by all means go for it!
+    $variables['current_path'] = $base_url . '/' . $current_path;
+    $variables['pager_current'] = $pager_current; 
+    $variables['items'] = $items;
+    $variables['ellipsis'] = $ellipsis;
   }
 }
 
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorRenderingTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorRenderingTest.php
index 161d215..b27d4e0 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorRenderingTest.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorRenderingTest.php
@@ -95,7 +95,7 @@ public function testFeedPage() {
 
     // Check for presence of an aggregator pager.
     $this->drupalGet('aggregator');
-    $elements = $this->xpath("//ul[@class=:class]", array(':class' => 'pager'));
+    $elements = $this->xpath("//ul[@class=:class]", array(':class' => 'pager__items'));
     $this->assertTrue(!empty($elements), 'Individual source page contains a pager.');
 
     // Check for sources page title.
@@ -110,7 +110,7 @@ public function testFeedPage() {
 
     // Check for the presence of a pager.
     $this->drupalGet('aggregator/sources/' . $feed->id());
-    $elements = $this->xpath("//ul[@class=:class]", array(':class' => 'pager'));
+    $elements = $this->xpath("//ul[@class=:class]", array(':class' => 'pager__items'));
     $this->assertTrue(!empty($elements), 'Individual source page contains a pager.');
   }
 }
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentPagerTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentPagerTest.php
index d1e447bf..ea9b55e 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentPagerTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentPagerTest.php
@@ -333,19 +333,19 @@ function testTwoPagers() {
     $this->assertRaw('Comment 1 on field comment');
     $this->assertRaw('Comment 1 on field comment_2');
     // Navigate to next page of field 1.
-    $this->clickLink('next ›');
+    $this->clickLink('Next page');
     // Check only one pager updated.
     $this->assertRaw('Comment 2 on field comment');
     $this->assertRaw('Comment 1 on field comment_2');
     // Return to page 1.
     $this->drupalGet('node/' . $node->id());
     // Navigate to next page of field 2.
-    $this->clickLink('next ›', 1);
+    $this->clickLink('Next page', 1);
     // Check only one pager updated.
     $this->assertRaw('Comment 1 on field comment');
     $this->assertRaw('Comment 2 on field comment_2');
     // Navigate to next page of field 1.
-    $this->clickLink('next ›');
+    $this->clickLink('Next page');
     // Check only one pager updated.
     $this->assertRaw('Comment 2 on field comment');
     $this->assertRaw('Comment 2 on field comment_2');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Pager/PagerTest.php b/core/modules/system/lib/Drupal/system/Tests/Pager/PagerTest.php
index 845aa28..51aea36 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Pager/PagerTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Pager/PagerTest.php
@@ -60,10 +60,10 @@ function testActiveClass() {
     $this->assertPagerItems($current_page);
 
     // Verify last page.
-    $elements = $this->xpath('//li[contains(@class, :class)]/a', array(':class' => 'pager-last'));
+    $elements = $this->xpath('//li/a[contains(@rel, :rel)]', array(':rel' => 'next'));
     preg_match('@page=(\d+)@', $elements[0]['href'], $matches);
     $current_page = (int) $matches[1];
-    $this->drupalGet($GLOBALS['base_root'] . $elements[0]['href'], array('external' => TRUE));
+    $this->drupalGet($elements[0]['href']);
     $this->assertPagerItems($current_page);
   }
 
@@ -74,7 +74,7 @@ function testActiveClass() {
    *   The current pager page the internal browser is on.
    */
   protected function assertPagerItems($current_page) {
-    $elements = $this->xpath('//ul[@class=:class]/li', array(':class' => 'pager'));
+    $elements = $this->xpath('//ul[@class=:class]/li', array(':class' => 'pager__items'));
     $this->assertTrue(!empty($elements), 'Pager found.');
 
     // Make current page 1-based.
@@ -97,14 +97,14 @@ protected function assertPagerItems($current_page) {
       // Make item/page index 1-based.
       $page++;
       if ($current_page == $page) {
-        $this->assertClass($element, 'pager-current', 'Item for current page has .pager-current class.');
-        $this->assertFalse(isset($element->a), 'Item for current page has no link.');
+        $this->assertClass($element, 'is-active', 'Item for current page has .is-active class.');
+        $this->assertTrue(isset($element->a), 'Item for current page has link.');
       }
       else {
-        $this->assertNoClass($element, 'pager-current', "Item for page $page has no .pager-current class.");
-        $this->assertClass($element, 'pager-item', "Item for page $page has .pager-item class.");
+        $this->assertNoClass($element, 'is-active', "Item for page $page has no .is-active class.");
+        //$this->assertClass($element, 'pager-item', "Item for page $page has .pager-item class.");
         $this->assertTrue($element->a, "Link to page $page found.");
-        $this->assertNoClass($element->a, 'active', "Link to page $page is not active.");
+        $this->assertNoClass($element, 'is-active', "Link to page $page is not active.");
       }
       unset($elements[--$page]);
     }
@@ -113,24 +113,24 @@ protected function assertPagerItems($current_page) {
 
     // Verify first/previous and next/last items and links.
     if (isset($first)) {
-      $this->assertClass($first, 'pager-first', 'Item for first page has .pager-first class.');
+      $this->assertClass($first->a->i, 'icon--go-first', 'Item for first page has .icon--go-first class.');
       $this->assertTrue($first->a, 'Link to first page found.');
-      $this->assertNoClass($first->a, 'active', 'Link to first page is not active.');
+      $this->assertNoClass($first, 'is-active', 'Link to first page is not active.');
     }
     if (isset($previous)) {
-      $this->assertClass($previous, 'pager-previous', 'Item for first page has .pager-previous class.');
+      $this->assertClass($previous->a->i, 'icon--go-previous', 'Item for first page has .icon--go-previous class.');
       $this->assertTrue($previous->a, 'Link to previous page found.');
-      $this->assertNoClass($previous->a, 'active', 'Link to previous page is not active.');
+      $this->assertNoClass($previous, 'is-active', 'Link to previous page is not active.');
     }
     if (isset($next)) {
-      $this->assertClass($next, 'pager-next', 'Item for next page has .pager-next class.');
+      $this->assertClass($next->a->i, 'icon--go-next', 'Item for next page has .icon--go-next class.');
       $this->assertTrue($next->a, 'Link to next page found.');
-      $this->assertNoClass($next->a, 'active', 'Link to next page is not active.');
+      $this->assertNoClass($next, 'is-active', 'Link to next page is not active.');
     }
     if (isset($last)) {
-      $this->assertClass($last, 'pager-last', 'Item for last page has .pager-last class.');
+      $this->assertClass($last->a->i, 'icon--go-last', 'Item for last page has .icon--go-last class.');
       $this->assertTrue($last->a, 'Link to last page found.');
-      $this->assertNoClass($last->a, 'active', 'Link to last page is not active.');
+      $this->assertNoClass($last, 'is-active', 'Link to last page is not active.');
     }
   }
 
diff --git a/core/modules/system/templates/item-list--pager.html.twig b/core/modules/system/templates/item-list--pager.html.twig
new file mode 100644
index 0000000..e8d16e0
--- /dev/null
+++ b/core/modules/system/templates/item-list--pager.html.twig
@@ -0,0 +1,36 @@
+{#
+/**
+ * @file
+ * Default theme implementation for an item list.
+ *
+ * Available variables:
+ * - items: A list of renderable items. Each item has a #wrapper_attributes
+ *   property which contains any HTML attributes which should be applied to the
+ *   <li> tag.
+ * - title: The title of the list.
+ * - list_type: The tag for list element ("ul" or "ol").
+ * - attributes: HTML attributes to be applied to the list.
+ * - empty: A message to display when there are no items. Allowed value is a
+ *   string or render array.
+ *
+ * @see template_preprocess_item_list()
+ *
+ * @ingroup themeable
+ */
+#}
+{%- if items or empty -%}
+  <div class="item-list">
+    {%- if title -%}
+      <h3>{{ title }}</h3>
+    {%- endif -%}
+    {%- if items -%}
+      <{{ list_type }}{{ attributes }}>
+        {%- for item in items -%}
+          <li{{ item.attributes }}>{{ item.value }}</li>
+        {%- endfor -%}
+      </{{ list_type }}>
+    {%- else -%}
+      {{- empty -}}
+    {%- endif -%}
+  </div>
+{%- endif %}
diff --git a/core/modules/system/templates/pager.html.twig b/core/modules/system/templates/pager.html.twig
index 47b20a7..127e21c 100644
--- a/core/modules/system/templates/pager.html.twig
+++ b/core/modules/system/templates/pager.html.twig
@@ -12,6 +12,37 @@
  */
 #}
 {% if items %}
-  <h2 class="visually-hidden">{{ 'Pages'|t }}</h2>
-  {{ items }}
+  <nav class="pager" role="navigation" aria-label="Pagination">
+    <h4 class="visually-hidden">{{ 'Pagination'|t }}</h4>
+    <ul class="pager__items">
+      {% if items.first %}
+        <li><a href="{{ current_path }}"><i class="icon icon--go-first" aria-hidden="true"></i><span class="visually-hidden">First page</span></a></li>
+      {% endif %}
+      {% if (items.previous or pager_current > 1) %}
+        <li><a href="{{ current_path }}?page={{ items.previous }}" rel="prev"><i class="icon icon--go-previous" aria-hidden="true"></i><span class="visually-hidden">Previous page</span></a></li>
+      {% endif %}
+      {% if ellipsis.prev %}
+        <li role="presentation"><i class="icon icon--ellipsis" aria-hidden="true"></i></li>
+      {% endif %}
+      
+      {% for key,item in items.pages %}
+        {% if item == pager_current %}
+          <li class="is-active"><a href="{{ current_path }}?page={{ key }}"></a><span class="visually-hidden">Current page </span>{{ item }}</span></li>
+        {% else %}
+          <li><a href="{{ current_path }}?page={{ key }}"><span class="visually-hidden">Page </span>{{ item }}</a></li>
+        {% endif %}
+      {% endfor %}
+      
+      {% if ellipsis.next %}
+        <li role="presentation"><i class="icon icon--ellipsis" aria-hidden="true"></i></li>
+      {% endif %}
+      {% if items.next %}
+        <li><a href="{{ current_path }}?page={{ items.next }}" rel="next"><i class="icon icon--go-next" aria-hidden="true"></i><span class="visually-hidden">Next page</span></a></li>
+      {% endif %}
+      {% if items.last %}
+        <li><a href="{{ current_path }}?page={{ items.last }}"><i class="icon icon--go-last" aria-hidden="true"></i><span class="visually-hidden">Last page</span></a></li>
+      {% endif %}
+    </ul>
+    
+  </nav>
 {% endif %}
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index ae967bd..e40a9ac 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -62,7 +62,7 @@ function template_preprocess_views_view(&$variables) {
 
   // @todo: Figure out whether this belongs into views_ui_preprocess_views_view.
   // Render title for the admin preview.
-  $variables['title'] = !empty($view->views_ui_context) ? Xss::filterAdmin($view->getTitle()) : '';
+  $variables['title'] = !empty($view->views_ui_context) ? filter_xss_admin($view->getTitle()) : '';
 
   if ($view->display_handler->renderPager()) {
     $exposed_input = isset($view->exposed_raw_input) ? $view->exposed_raw_input : NULL;
@@ -203,7 +203,7 @@ function template_preprocess_views_view_fields(&$variables) {
       }
 
       if (!empty($variables['options']['separator']) && $previous_inline && $object->inline && $object->content) {
-        $object->separator = Xss::filterAdmin($variables['options']['separator']);
+        $object->separator = filter_xss_admin($variables['options']['separator']);
       }
 
       $object->class = drupal_clean_css_identifier($id);
@@ -453,7 +453,7 @@ function template_preprocess_views_view_summary_unformatted(&$variables) {
   foreach ($variables['rows'] as $id => $row) {
     // Only false on first time.
     if ($count++) {
-      $variables['rows'][$id]->separator = Xss::filterAdmin($variables['options']['separator']);
+      $variables['rows'][$id]->separator = filter_xss_admin($variables['options']['separator']);
     }
     $variables['rows'][$id]->attributes = array();
     $variables['rows'][$id]->link = $argument->summaryName($row);
@@ -641,7 +641,7 @@ function template_preprocess_views_view_table(&$variables) {
           // Place the field into the column, along with an optional separator.
           if (!empty($column_reference['content'])) {
             if (!empty($options['info'][$column]['separator'])) {
-              $column_reference['content'] .= Xss::filterAdmin($options['info'][$column]['separator']);
+              $column_reference['content'] .= filter_xss_admin($options['info'][$column]['separator']);
             }
           }
           else {
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php
index 01feff6..e6e57c4 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php
@@ -110,58 +110,53 @@ public function testPreviewWithPagersUI() {
     $this->getPreviewAJAX('test_pager_full', 'default', 5);
 
     // Test that the pager is present and rendered.
-    $elements = $this->xpath('//ul[@class = "pager"]/li');
+    $elements = $this->xpath('//ul[@class = "pager__items"]/li');
     $this->assertTrue(!empty($elements), 'Full pager found.');
 
     // Verify elements and links to pages.
     // We expect to find 5 elements: current page == 1, links to pages 2 and
     // and 3, links to 'next >' and 'last >>' pages.
-    $this->assertClass($elements[0], 'pager-current', 'Element for current page has .pager-current class.');
-    $this->assertFalse(isset($elements[0]->a), 'Element for current page has no link.');
+    $this->assertClass($elements[0], 'is-active', 'Element for current page has .is-active class.');
 
-    $this->assertClass($elements[1], 'pager-item', "Element for page 2 has .pager-item class.");
     $this->assertTrue($elements[1]->a, "Link to page 2 found.");
 
-    $this->assertClass($elements[2], 'pager-item', "Element for page 3 has .pager-item class.");
     $this->assertTrue($elements[2]->a, "Link to page 3 found.");
 
-    $this->assertClass($elements[3], 'pager-next', "Element for next page has .pager-next class.");
+    $this->assertClass($elements[3]->a->i, 'icon--go-next', "Element for next page has .icon--go-next class.");
     $this->assertTrue($elements[3]->a, "Link to next page found.");
 
-    $this->assertClass($elements[4], 'pager-last', "Element for last page has .pager-last class.");
+    $this->assertClass($elements[4]->a->i, 'icon--go-last', "Element for last page has .icon--go-last class.");
     $this->assertTrue($elements[4]->a, "Link to last page found.");
 
     // Navigate to next page.
-    $elements = $this->xpath('//li[contains(@class, :class)]/a', array(':class' => 'pager-next'));
-    $this->clickPreviewLinkAJAX($elements[0]['href'], 5);
+    //$elements = $this->xpath('//li/a/i[contains(@class, :class)]', array(':class' => 'icon--go-next'));
+    $this->clickPreviewLinkAJAX($elements[3]->a['href'], 5);
 
     // Test that the pager is present and rendered.
-    $elements = $this->xpath('//ul[@class = "pager"]/li');
+    $elements = $this->xpath('//ul[@class = "pager__items"]/li');
     $this->assertTrue(!empty($elements), 'Full pager found.');
 
     // Verify elements and links to pages.
     // We expect to find 7 elements: links to '<< first' and '< previous'
     // pages, link to page 1, current page == 2, link to page 3 and links
     // to 'next >' and 'last >>' pages.
-    $this->assertClass($elements[0], 'pager-first', "Element for next page has .pager-first class.");
+    $this->assertClass($elements[0]->a->i, 'icon--go-first', "Element for first page has .icon--go-first class.");
     $this->assertTrue($elements[0]->a, "Link to first page found.");
 
-    $this->assertClass($elements[1], 'pager-previous', "Element for previous page has .pager-previous class.");
+    $this->assertClass($elements[1]->a->i, 'icon--go-previous', "Element for previous page has .icon--go-previous class.");
     $this->assertTrue($elements[1]->a, "Link to previous page found.");
 
-    $this->assertClass($elements[2], 'pager-item', "Element for page 1 has .pager-item class.");
     $this->assertTrue($elements[2]->a, "Link to page 1 found.");
 
-    $this->assertClass($elements[3], 'pager-current', 'Element for current page has .pager-current class.');
-    $this->assertFalse(isset($elements[3]->a), 'Element for current page has no link.');
+    $this->assertClass($elements[3], 'is-active', 'Element for current page has .is-active class.');
+    $this->assertTrue(isset($elements[3]->a), 'Element for current page has link.');
 
-    $this->assertClass($elements[4], 'pager-item', "Element for page 3 has .pager-item class.");
     $this->assertTrue($elements[4]->a, "Link to page 3 found.");
 
-    $this->assertClass($elements[5], 'pager-next', "Element for next page has .pager-next class.");
+    $this->assertClass($elements[5]->a->i, 'icon--go-next', "Element for next page has .icon--go-next class.");
     $this->assertTrue($elements[5]->a, "Link to next page found.");
 
-    $this->assertClass($elements[6], 'pager-last', "Element for last page has .pager-last class.");
+    $this->assertClass($elements[6]->a->i, 'icon--go-last', "Element for last page has .icon--go-last class.");
     $this->assertTrue($elements[6]->a, "Link to last page found.");
 
     // Test Mini Pager.
diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css
index d8dff1a..96c14ad 100644
--- a/core/themes/bartik/css/style.css
+++ b/core/themes/bartik/css/style.css
@@ -129,7 +129,7 @@ body,
 ul.contextual-links,
 ul.links,
 ul.primary,
-.item-list .pager,
+.pager__items,
 div.field-type-taxonomy-term-reference,
 div.messages,
 div.meta,
@@ -276,28 +276,49 @@ table ul.links li {
   font-size: 0.923em;
   text-shadow: 0 0 0 !important;
 }
-.item-list .pager {
+nav.pager {
+  text-align: center;
+}
+.pager__items {
+  display: inline-block;
   font-size: 0.929em;
+  list-style: none;
 }
-.item-list .pager li {
+.pager__items li {
+  display: inline-block;
   padding: 0;
 }
-.item-list .pager a {
+.pager__items a {
   display: inline-block;
   padding: 10px 15px;
 }
-.item-list .pager .pager-first a {
-  padding: 10px 10px 10px 0;
+.pager__items .is-active {
+  font-weight: 700;
+  padding: 10px 15px;
+}
+.pager__items .is-active a {
+  padding: 0;
+}
+.pager__items .icon {
+  border-bottom-width: 0;
+  color: #2a678c;
+  font-weight: 600;
+  font-style: normal;
+}
+.pager__items .icon--go-first:before {
+  content: "\00AB\00A0 first";
+}
+.pager__items .icon--go-previous:before {
+  content: "\003C\00A0 previous";
 }
-.item-list .pager .pager-previous a {
-  padding: 10px 0;
+.pager__items .icon--ellipsis:before {
+  content: "...";
 }
-.item-list .pager .pager-current {
-  padding: 0 10px;
+.pager__items .icon--go-next:after {
+  content: "next \00A0\003E";
 }
-.item-list .pager .pager-next a,
-.item-list .pager .pager-last a {
-  padding: 10px 0 10px 10px;
+.pager__items .icon--go-last:after {
+  content: "last \00A0\00BB";
 }
 ul.menu li {
   margin: 0;
diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
index 33b3eee..bf84af5 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -521,18 +521,21 @@ div.submitted {
 
 /**
  * Pagination.
- * The item-list CSS uses quite strong selectors, we have to match them here to
- * override.
  */
-.item-list .pager li {
+nav.pager {
+  text-align: center;
+}
+.pager__items {
+  display: inline-block;
+}
+.pager__items li {
   display: inline-block;
   color: #8c8c8c;
   font-size: 1.08em;
   padding: 0 0.6em;
   margin: 0;
 }
-.item-list .pager a,
-.item-list .pager .pager-current {
+.pager__items a {
   border-bottom: 2px solid transparent;
   line-height: 1.55em;
   padding: 0 5px;
@@ -543,28 +546,41 @@ div.submitted {
   font-weight: 600;
   -webkit-font-smoothing: antialiased;
 }
-.item-list .pager a {
+.pager__items a {
   padding-bottom: 3px;
 }
-.item-list .pager .pager-current {
+.pager__items .is-active {
   border-bottom-width: 3px;
   border-bottom-color: #2a678c;
   color: #2a678c;
   margin: 0 5px;
   font-weight: 700;
 }
-.item-list .pager a:focus,
-.item-list .pager a:hover {
+.pager__items a:focus,
+.pager__items a:hover {
   border-bottom-color: #3395d2;
   color: #3395d2;
 }
-.item-list .pager-next a,
-.item-list .pager-last a,
-.item-list .pager-first a,
-.item-list .pager-previous a {
+.pager__items .icon {
   border-bottom-width: 0;
   color: #2a678c;
   font-weight: 600;
+  font-style: normal;
+}
+.pager__items .icon--go-first:before {
+  content: "\00AB\00A0 first";
+}
+.pager__items .icon--go-previous:before {
+  content: "\003C\00A0 previous";
+}
+.pager__items .icon--ellipsis:before {
+  content: "...";
+}
+.pager__items .icon--go-next:after {
+  content: "next \00A0\003E";
+}
+.pager__items .icon--go-last:after {
+  content: "last \00A0\00BB";
 }
 
 /**