diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index bf2e58e..ac3182f 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -266,7 +266,12 @@ function template_preprocess_menu_link(&$variables) {
   $element = $variables['element'];
   $element['#localized_options']['set_active_class'] = TRUE;
   $variables['sub_menu'] = $element['#below'];
-  $variables['link'] = l($element['#title'], $element['#href'], $element['#localized_options']);
+  $variables['link'] = array(
+    '#type' => 'link',
+    '#title' => $element['#title'],
+    '#href' => $element['#href'],
+    '#options' => $element['#localized_options'],
+  );
   $variables['attributes'] = $element['#attributes'];
 }
 
@@ -304,15 +309,22 @@ function template_preprocess_menu_local_task(&$variables) {
   }
   $link['localized_options']['set_active_class'] = TRUE;
 
+  $variables['link'] = array(
+      '#type' => 'link',
+      '#title' => $link_text,
+      '#options' => $link['localized_options'],
+  );
+
   if (!empty($link['href'])) {
     // @todo - remove this once all pages are converted to routes.
-    $a_tag = l($link_text, $link['href'], $link['localized_options']);
+    $variables['link']['#href'] = $link['href'];
   }
   else {
-    $a_tag = \Drupal::l($link_text, $link['route_name'], $link['route_parameters'], $link['localized_options']);
+    $variables['link'] += array(
+      '#route_name' => $link['route_name'],
+      '#route_parameters' => $link['route_parameters'],
+    );
   }
-
-  $variables['link'] = $a_tag;
 }
 
 /**
@@ -337,14 +349,23 @@ function template_preprocess_menu_local_action(&$variables) {
   $link['localized_options']['attributes']['class'][] = 'button-action';
   $link['localized_options']['set_active_class'] = TRUE;
 
+  $variables['link'] = array(
+      '#type' => 'link',
+      '#title' => $link['title'],
+      '#options' => $link['localized_options'],
+  );
+
   // @todo Remove this check and the call to l() when all pages are converted to
   //   routes.
   // @todo Figure out how to support local actions without a href properly.
   if ($link['href'] === '' && !empty($link['route_name'])) {
-    $variables['link'] = Drupal::l($link['title'], $link['route_name'], $link['route_parameters'], $link['localized_options']);
+    $variables['link'] += array(
+      '#route_name' => $link['route_name'],
+      '#route_parameters' => $link['route_parameters'],
+    );
   }
   else {
-    $variables['link'] = l($link['title'], $link['href'], $link['localized_options']);
+    $variables['link']['#href'] = $link['href'];
   }
 }
 
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index ed0e551..05d3514 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -2624,9 +2624,11 @@ function drupal_common_theme() {
     ),
     'menu_local_task' => array(
       'render element' => 'element',
+      'template' => 'menu-local-task',
     ),
     'menu_local_action' => array(
       'render element' => 'element',
+        'template' => 'menu-local-action',
     ),
     'menu_local_tasks' => array(
       'variables' => array('primary' => array(), 'secondary' => array()),
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 8feb47b..435d930 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -712,6 +712,16 @@ function system_theme_suggestions_field(array $variables) {
 }
 
 /**
+ * Implements hook_theme_suggestions_HOOK().
+ */
+function system_theme_suggestions_menu_link(array $variables) {
+  $suggestions = array();
+  $element = $variables['element'];
+
+  $suggestions[] = 'menu_link__' . $element['#original_link']['menu_name'];
+}
+
+/**
  * Implements hook_stream_wrappers().
  */
 function system_stream_wrappers() {
diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme
index c3e7a32..870274a 100644
--- a/core/themes/seven/seven.theme
+++ b/core/themes/seven/seven.theme
@@ -37,79 +37,34 @@ function seven_preprocess_page(&$variables) {
 }
 
 /**
- * Overrides theme_menu_local_tasks().
+ * Implements hook_pre_render_HOOK() for menu-local-tasks templates.
  *
- * Returns HTML for primary and secondary local tasks.
- *
- **/
-function seven_menu_local_tasks(&$variables) {
-  $output = '';
-
+ * Use preprocess hook to set #attached to child elemnts
+ * because they will be processed by Twig and drupal_render will
+ * be invoked.
+ */
+function seven_preprocess_menu_local_tasks(array &$variables) {
   if (!empty($variables['primary'])) {
     $variables['primary']['#attached'] = array(
-      'library' => array(
-        'seven/drupal.nav-tabs',
-      ),
+        'library' => array(
+            'seven/drupal.nav-tabs',
+        ),
     );
-    $variables['primary']['#prefix'] = '<h2 id="primary-tabs-title" class="visually-hidden">' . t('Primary tabs') . '</h2>';
-    $variables['primary']['#prefix'] .= '<nav role="navigation" class="is-horizontal is-collapsible" aria-labelledby="primary-tabs-title" data-drupal-nav-tabs>';
-    $variables['primary']['#prefix'] .= '<button class="reset-appearance tabs__tab tabs__trigger" aria-label="Primary tabs display toggle" data-drupal-nav-tabs-trigger>&bull;&bull;&bull;</button>';
-    $variables['primary']['#prefix'] .= '<ul class="tabs primary clearfix" data-drupal-nav-tabs-target>';
-    $variables['primary']['#suffix'] = '</ul>';
-    $variables['primary']['#suffix'] .= '</nav>';
-    $output .= drupal_render($variables['primary']);
   }
-  if (!empty($variables['secondary'])) {
+  elseif (!empty($variables['secondary'])) {
     $variables['secondary']['#attached'] = array(
-      'library' => array(
-        'seven/drupal.nav-tabs',
-      ),
+        'library' => array(
+            'seven/drupal.nav-tabs',
+        ),
     );
-    $variables['secondary']['#prefix'] = '<h2 id="secondary-tabs-title" class="visually-hidden">' . t('Secondary tabs') . '</h2>';
-    $variables['secondary']['#prefix'] .= '<nav role="navigation" class="is-horizontal" aria-labelledby="secondary-tabs-title" data-drupal-nav-tabs>';
-    $variables['secondary']['#prefix'] .= '<ul class="tabs secondary clearfix">';
-    $variables['secondary']['#suffix'] = '</ul>';
-    $variables['secondary']['#suffix'] .= '</nav>';
-    $output .= drupal_render($variables['secondary']);
   }
-
-  return $output;
 }
 
 /**
- * Overrides theme_menu_local_task().
- *
- * Returns HTML for a local task.
- *
- **/
-function seven_menu_local_task($variables) {
-  $link = $variables['element']['#link'];
-  $link += array(
-    'localized_options' => array(),
-  );
-  $link_text = $link['title'];
-
-  if (!empty($variables['element']['#active'])) {
-    // Add text to indicate active tab for non-visual users.
-    $active = '<span class="visually-hidden">' . t('(active tab)') . '</span>';
-
-    // If the link does not contain HTML already, String::checkPlain() it now.
-    // After we set 'html'=TRUE the link will not be sanitized by l().
-    if (empty($link['localized_options']['html'])) {
-      $link['title'] = String::checkPlain($link['title']);
-    }
-    $link['localized_options']['html'] = TRUE;
-    $link_text = t('!local-task-title!active', array('!local-task-title' => $link['title'], '!active' => $active));
-  }
-  if (!empty($link['href'])) {
-    // @todo - remove this once all pages are converted to routes.
-    $a_tag = l($link_text, $link['href'], $link['localized_options']);
-  }
-  else {
-    $a_tag = \Drupal::l($link_text, $link['route_name'], $link['route_parameters'], $link['localized_options']);
-  }
-
-  return '<li' . (!empty($variables['element']['#active']) ? ' class="tabs__tab active"' : ' class="tabs__tab"') . '>' . $a_tag . '</li>';
+ * Implements hook_preprocess_HOOK() for menu-local-task templates.
+ */
+function seven_preprocess_menu_local_task(array &$variables) {
+  $variables['attributes']['class'][] = 'tabs__tab';
 }
 
 /**
@@ -214,46 +169,21 @@ function seven_tablesort_indicator($variables) {
 }
 
 /**
- * Overrides theme_menu_local_action().
+ * Implements hook_preprocess_HOOK() for menu-local-action templates.
  */
-function seven_menu_local_action($variables) {
-  $link = $variables['element']['#link'];
-  $link += array(
-    'href' => '',
-    'localized_options' => array(),
-    'route_parameters' => array(),
-  );
-  $link['localized_options']['attributes']['class'][] = 'button';
-  $link['localized_options']['attributes']['class'][] = 'button--primary';
-  $link['localized_options']['attributes']['class'][] = 'button--small';
-
-  // @todo Replace with a generalized solution for icons.
-  // See http://drupal.org/node/1849712
-  $link['localized_options']['attributes']['class'][] = 'button-action';
+function seven_preprocess_menu_local_action(array &$variables) {
+  $variables['link']['#options']['attributes']['class'][] = 'button--primary';
+  $variables['link']['#options']['attributes']['class'][] = 'button--small';
 
   // We require Modernizr's touch test for button styling.
   $libraries = array(
-    '#attached' => array(
-      'library' => array(
-        'core/modernizr',
+      '#attached' => array(
+          'library' => array(
+              'core/modernizr',
+          ),
       ),
-    ),
   );
   drupal_render($libraries);
-
-  $output = '<li>';
-  // @todo Remove this check and the call to l() when all pages are converted to
-  //   routes.
-  // @todo Figure out how to support local actions without a href properly.
-  if ($link['href'] === '' && !empty($link['route_name'])) {
-    $output .= Drupal::l($link['title'], $link['route_name'], $link['route_parameters'], $link['localized_options']);
-  }
-  else {
-    $output .= l($link['title'], $link['href'], $link['localized_options']);
-  }
-  $output .= "</li>";
-
-  return $output;
 }
 
 /**