diff --git a/core/modules/views/templates/views-mini-pager.html.twig b/core/modules/views/templates/views-mini-pager.html.twig
index 94427d4..7e09b5f 100644
--- a/core/modules/views/templates/views-mini-pager.html.twig
+++ b/core/modules/views/templates/views-mini-pager.html.twig
@@ -16,13 +16,39 @@
     <h4 id="pagination-heading" class="visually-hidden">{{ 'Pagination'|t }}</h4>
     <ul class="pager__items">
       {% if items.previous %}
-        <li class="pager__item pager__item-previous">{{ items.previous }}</li>
+        <li class="pager__item pager__item-previous">
+          <a href="{{ items.previous.href }}" {{ items.previous.attributes }}>
+            <span class="visually-hidden">
+              {% trans %}
+                Previous page
+              {% endtrans %}
+            </span>
+            <span aria-hidden="true">
+              {{ items.previous.text }}
+            </span>
+          </a>
+        </li>
       {% endif %}
       {% if items.current %}
-        <li class="pager__item pager__item-current">{{ items.current }}</li>
+        <li class="pager__item pager__item-current">
+          {% trans %}
+            Page {{ items.current }}
+          {% endtrans %}
+        </li>
       {% endif %}
       {% if items.next %}
-        <li class="pager__item pager__item-next">{{ items.next }}</li>
+        <li class="pager__item pager__item-next">
+          <a href="{{ items.next.href }}" {{ items.next.attributes }}>
+            <span class="visually-hidden">
+              {% trans %}
+                Next page
+              {% endtrans %}
+            </span>
+            <span aria-hidden="true">
+              {{ items.next.text }}
+            </span>
+          </a>
+        </li>
       {% endif %}
     </ul>
   </nav>
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index 2809f0c..75e784b 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -1103,8 +1103,6 @@ function template_preprocess_views_mini_pager(&$variables) {
   $tags += array(
     1 => t('‹‹'),
     3 => t('››'),
-    4 => t('Previous page'),
-    5 => t('Next page'),
   );
 
   // Current is the page we are currently paged to.
@@ -1113,49 +1111,27 @@ function template_preprocess_views_mini_pager(&$variables) {
 
   $li_previous = array();
   if ($pager_total[$element] > 1 && $pager_page_array[$element] > 0) {
-    $li_previous = array(
-      '#type' => 'link',
-      '#title' => '<span class="visually-hidden">' . $tags[4] . '</span><span aria-hidden="true">' . $tags[1] . '</span>',
-      '#href' => $current_path,
-      '#options' => array(
-        'html' => TRUE,
-        '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,
-          'interval' => -1,
-        ),
-      ),
+    $options = array(
+      'query' => pager_query_add_page($parameters, $element, $pager_page_array[$element] - 1),
+    );
+    $li_previous['href'] = url($current_path, $options);
+    $li_previous['text'] = $tags[1];
+    $li_previous['attributes'] = array(
+      'title' => t('Go to previous page'),
+      'rel' => 'prev',
     );
   }
 
   $li_next = array();
   if ($pager_page_array[$element] < ($pager_total[$element] - 1)) {
-    $li_next = array(
-      '#type' => 'link',
-      '#title' => '<span class="visually-hidden">' . $tags[5] . '</span><span aria-hidden="true">' . $tags[3] . '</span>',
-      '#href' => $current_path,
-      '#options' => array(
-        'html' => TRUE,
-        '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,
-          'interval' => 1,
-        ),
-      ),
+    $options = array(
+      'query' => pager_query_add_page($parameters, $element, $pager_page_array[$element] + 1),
+    );
+    $li_next['href'] = url($current_path, $options);
+    $li_next['text'] = $tags[3];
+    $li_next['attributes'] = array(
+      'title' => t('Go to next page'),
+      'rel' => 'next',
     );
   }
 
@@ -1167,7 +1143,7 @@ function template_preprocess_views_mini_pager(&$variables) {
   }
 
   $items['previous'] = $li_previous;
-  $items['current'] = t('Page @current', array('@current' => $pager_current));
+  $items['current'] = $pager_current;
   $items['next'] = $li_next;
 
   $variables['items'] = $items;