diff --git a/bootstrap_barrio.theme b/bootstrap_barrio.theme
index e81691261aff6f70dd410d702e423bdb3c4bade5..5443ad98274b412913b102e256fbac39203f5e5a 100644
--- a/bootstrap_barrio.theme
+++ b/bootstrap_barrio.theme
@@ -145,6 +145,12 @@ function bootstrap_barrio_preprocess_page(&$variables) {
     $variables['#attached']['library'][] = 'bootstrap_barrio/slide_nav';
   }
 
+  switch (theme_get_setting('bootstrap_barrio_tabs_style')) {
+    case 'full':
+      $variables['#attached']['library'][] = 'bootstrap_barrio/tabs_full';
+      break;
+  }
+
   $fonts = theme_get_setting('bootstrap_barrio_google_fonts');
   if ($fonts) {
     $variables['#attached']['library'][] = 'bootstrap_barrio/' . $fonts;
@@ -467,23 +473,20 @@ function bootstrap_barrio_preprocess_menu_local_task(&$variables) {
   $options = $url->getOptions();
   $url->setOptions($options + $link['localized_options']);
   $variables['item'] = Link::fromTextAndUrl($link['title'], $url);
+  switch (theme_get_setting('bootstrap_barrio_tabs_style')) {
+    case 'pills':
+      $variables['nav-style'] = 'nav-pills';
+      break;
+    default:
+      $variables['nav-style'] = 'nav-tabs';
+      break;
+  }
 }
 
 /**
  * Implements hook_theme_suggestions_HOOK_alter().
  */
 function bootstrap_barrio_theme_suggestions_menu_alter(array &$suggestions, array $variables) {
-  if ($variables['menu_name'] == "tools") {
-    switch (theme_get_setting('bootstrap_barrio_tabs_style')) {
-      case 'full':
-        $suggestions[] = 'menu_local_tasks_full';
-        break;
-  
-      case 'pills':
-        $suggestions[] = 'menu_local_tasks_pills';
-        break;
-    }
-  }
   // Taken from http://kristiankaa.dk/article/drupal8-region-specific-menu-theme-hook-suggestion
   // bootstrap_barrio_preprocess_block(&$variables)
   if (isset($variables['attributes']['block'])) {
diff --git a/templates/navigation/menu-local-tasks-full.html.twig b/templates/navigation/menu-local-tasks-full.html.twig
deleted file mode 100644
index 91da6cb6e4c97b5fd48c4642cda3066fe60a645b..0000000000000000000000000000000000000000
--- a/templates/navigation/menu-local-tasks-full.html.twig
+++ /dev/null
@@ -1,24 +0,0 @@
-{#
-/**
- * @file
- * Bootstrap Barrio's Theme override to display primary and secondary local tasks.
- *
- * Available variables:
- * - primary: HTML list items representing primary tasks.
- * - secondary: HTML list items representing primary tasks.
- *
- * Each item in these variables (primary and secondary) can be individually
- * themed in menu-local-task.html.twig.
- *
- * @see template_preprocess_menu_local_tasks()
- */
-#}
-{{ attach_library('bootstrap_barrio/tabs_full') }}
-{% if primary %}
-  <h2 class="visually-hidden">{{ 'Primary tabs'|t }}</h2>
-  <ul class="nav nav-tabs primary">{{ primary }}</ul>
-{% endif %}
-{% if secondary %}
-  <h2 class="visually-hidden">{{ 'Secondary tabs'|t }}</h2>
-  <ul class="nav nav-tabs secondary">{{ secondary }}</ul>
-{% endif %}
diff --git a/templates/navigation/menu-local-tasks-pills.html.twig b/templates/navigation/menu-local-tasks-pills.html.twig
deleted file mode 100644
index 2cc991c70882340b8e5e34328c570c8b1acdd2ae..0000000000000000000000000000000000000000
--- a/templates/navigation/menu-local-tasks-pills.html.twig
+++ /dev/null
@@ -1,24 +0,0 @@
-{#
-/**
- * @file
- * Bootstrap Barrio's Theme override to display primary and secondary local tasks.
- *
- * Available variables:
- * - primary: HTML list items representing primary tasks.
- * - secondary: HTML list items representing primary tasks.
- *
- * Each item in these variables (primary and secondary) can be individually
- * themed in menu-local-task.html.twig.
- *
- * @see template_preprocess_menu_local_tasks()
- */
-#}
-{{ attach_library('bootstrap_barrio/tabs') }}
-{% if primary %}
-  <h2 class="visually-hidden">{{ 'Primary tabs'|t }}</h2>
-  <ul class="nav nav-pills primary">{{ primary }}</ul>
-{% endif %}
-{% if secondary %}
-  <h2 class="visually-hidden">{{ 'Secondary tabs'|t }}</h2>
-  <ul class="nav nav-pills secondary">{{ secondary }}</ul>
-{% endif %}
diff --git a/templates/navigation/menu-local-tasks.html.twig b/templates/navigation/menu-local-tasks.html.twig
index ca56182be6bf088ba3f463cfe1a2911f0a3fac37..74a2e9618f366026bf8af4d3d70186dfc76e51c4 100644
--- a/templates/navigation/menu-local-tasks.html.twig
+++ b/templates/navigation/menu-local-tasks.html.twig
@@ -16,9 +16,9 @@
 {{ attach_library('bootstrap_barrio/tabs') }}
 {% if primary %}
   <h2 class="visually-hidden">{{ 'Primary tabs'|t }}</h2>
-  <ul class="nav nav-tabs primary">{{ primary }}</ul>
+  <ul class="nav {{ nav-style }} primary">{{ primary }}</ul>
 {% endif %}
 {% if secondary %}
   <h2 class="visually-hidden">{{ 'Secondary tabs'|t }}</h2>
-  <ul class="nav nav-tabs secondary">{{ secondary }}</ul>
+  <ul class="nav {{ nav-style }} secondary">{{ secondary }}</ul>
 {% endif %}