diff --git a/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationViewListUiTest.php b/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationViewListUiTest.php
index a0b65e9..eb45b82 100644
--- a/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationViewListUiTest.php
+++ b/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationViewListUiTest.php
@@ -61,6 +61,9 @@ public function testTranslateOperationInViewListUi() {
     // Test if the link to translate actually goes to the translate page.
     $this->drupalGet($translate_link);
     $this->assertRaw('<th>' . t('Language') . '</th>');
+
+    // Test that the 'Edit' tab appears.
+    $this->assertLinkByHref('admin/structure/views/view/test_view');
   }
 
 }
diff --git a/core/modules/entity/entity.local_tasks.yml b/core/modules/entity/entity.local_tasks.yml
new file mode 100644
index 0000000..54895b4
--- /dev/null
+++ b/core/modules/entity/entity.local_tasks.yml
@@ -0,0 +1,9 @@
+entity.view_mode_edit:
+  title: 'Edit'
+  route_name: entity.view_mode_edit
+  tab_root_id: entity.view_mode_edit
+
+entity.form_mode_edit:
+  title: 'Edit'
+  route_name: entity.form_mode_edit
+  tab_root_id: entity.form_mode_edit
diff --git a/core/modules/image/image.local_tasks.yml b/core/modules/image/image.local_tasks.yml
new file mode 100644
index 0000000..3aeeebd
--- /dev/null
+++ b/core/modules/image/image.local_tasks.yml
@@ -0,0 +1,4 @@
+image.style_edit:
+  title: 'Edit'
+  route_name: image.style_edit
+  tab_root_id: image.style_edit
diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index 8abca8b..ec12e15 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -105,10 +105,6 @@ function image_menu() {
     'description' => 'Configure an image style.',
     'route_name' => 'image.style_edit',
   );
-  $items['admin/config/media/image-styles/manage/%image_style/edit'] = array(
-    'title' => 'Edit',
-    'type' => MENU_DEFAULT_LOCAL_TASK,
-  );
   $items['admin/config/media/image-styles/manage/%/effects/%'] = array(
     'title' => 'Edit image effect',
     'description' => 'Edit an existing effect within a style.',
diff --git a/core/modules/menu/menu.local_tasks.yml b/core/modules/menu/menu.local_tasks.yml
new file mode 100644
index 0000000..3b2bf45
--- /dev/null
+++ b/core/modules/menu/menu.local_tasks.yml
@@ -0,0 +1,4 @@
+menu.menu_edit:
+  title: 'Edit menu'
+  route_name: menu.menu_edit
+  tab_root_id: menu.menu_edit
diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module
index 519bdd9..eff3d8d 100644
--- a/core/modules/menu/menu.module
+++ b/core/modules/menu/menu.module
@@ -86,11 +86,6 @@ function menu_menu() {
     'title callback' => 'entity_page_label',
     'title arguments' => array(4),
   );
-  $items['admin/structure/menu/manage/%menu/edit'] = array(
-    'title' => 'Edit menu',
-    'type' => MENU_DEFAULT_LOCAL_TASK,
-    'context' => MENU_CONTEXT_PAGE,
-  );
   $items['admin/structure/menu/item/%menu_link/edit'] = array(
     'title' => 'Edit menu link',
     'route_name' => 'menu.link_edit',
diff --git a/core/modules/shortcut/shortcut.local_tasks.yml b/core/modules/shortcut/shortcut.local_tasks.yml
index edfeaeb..e25ecd7 100644
--- a/core/modules/shortcut/shortcut.local_tasks.yml
+++ b/core/modules/shortcut/shortcut.local_tasks.yml
@@ -2,3 +2,13 @@ shortcut.overview:
   route_name: shortcut.overview
   tab_root_id: user.view
   title: 'Shortcuts'
+
+shortcut.set_customize:
+  title: 'List links'
+  route_name: shortcut.set_customize
+  tab_root_id: shortcut.set_customize
+shortcut.set_edit:
+  title: 'Edit set name'
+  route_name: shortcut.set_edit
+  tab_root_id: shortcut.set_customize
+  weight: 10
diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index 5579d55..d0594b0 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -96,16 +96,6 @@ function shortcut_menu() {
     'title callback' => 'entity_page_label',
     'title arguments' => array(5),
   );
-  $items['admin/config/user-interface/shortcut/manage/%shortcut_set/links'] = array(
-    'title' => 'List links',
-    'type' => MENU_DEFAULT_LOCAL_TASK,
-  );
-  $items['admin/config/user-interface/shortcut/manage/%shortcut_set/edit'] = array(
-    'title' => 'Edit set name',
-    'route_name' => 'shortcut.set_edit',
-    'type' => MENU_LOCAL_TASK,
-    'weight' => 10,
-  );
   $items['admin/config/user-interface/shortcut/link/%menu_link'] = array(
     'title' => 'Edit shortcut',
     'route_name' => 'shortcut.link_edit',
diff --git a/core/modules/system/system.local_tasks.yml b/core/modules/system/system.local_tasks.yml
index 3cf14ad..0ea4ef3 100644
--- a/core/modules/system/system.local_tasks.yml
+++ b/core/modules/system/system.local_tasks.yml
@@ -61,3 +61,7 @@ system.date_format_list:
   route_name: system.date_format_list
   tab_root_id: system.date_format_list
   title: 'List'
+system.date_format_edit:
+  title: 'Edit'
+  route_name: system.date_format_edit
+  tab_root_id: system.date_format_edit
diff --git a/core/modules/user/user.local_tasks.yml b/core/modules/user/user.local_tasks.yml
index c69ac8e..c418f0b 100644
--- a/core/modules/user/user.local_tasks.yml
+++ b/core/modules/user/user.local_tasks.yml
@@ -3,6 +3,11 @@ user.role_list_tab:
   title: 'Roles'
   tab_root_id: user.role_list_tab
 
+user.role_edit:
+  title: 'Edit'
+  route_name: user.role_edit
+  tab_root_id: user.role_edit
+
 user.account_settings_tab:
   route_name: user.account_settings
   title: 'Settings'
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 742727d..4ee0675 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -786,10 +786,6 @@ function user_menu() {
     'title' => 'Edit role',
     'route_name' => 'user.role_edit',
   );
-  $items['admin/people/roles/manage/%user_role/edit'] = array(
-    'title' => 'Edit',
-    'type' => MENU_DEFAULT_LOCAL_TASK,
-  );
 
   // Administration pages.
   $items['admin/config/people'] = array(
diff --git a/core/modules/views_ui/views_ui.local_tasks.yml b/core/modules/views_ui/views_ui.local_tasks.yml
index 7974734..028ebc2 100644
--- a/core/modules/views_ui/views_ui.local_tasks.yml
+++ b/core/modules/views_ui/views_ui.local_tasks.yml
@@ -25,3 +25,8 @@ views_ui.reports_fields:
   route_name: views_ui.reports_fields
   title: 'Used in views'
   tab_root_id: field_ui.list
+
+views_ui.edit:
+  title: 'Edit'
+  route_name: views_ui.edit
+  tab_root_id: views_ui.edit
diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module
index 53261e1..c6a6954 100644
--- a/core/modules/views_ui/views_ui.module
+++ b/core/modules/views_ui/views_ui.module
@@ -25,12 +25,6 @@ function views_ui_menu() {
     'route_name' => 'views_ui.list',
   );
 
-  // The primary Edit View page. Secondary tabs for each Display are added in
-  // views_ui_menu_local_tasks_alter().
-  $items['admin/structure/views/view/%'] = array(
-    'route_name' => 'views_ui.edit',
-  );
-
   // A page in the Reports section to show usage of plugins in all views.
   $items['admin/reports/views-plugins'] = array(
     'title' => 'Views plugins',