diff --git a/admin_toolbar_tools/admin_toolbar_tools.module b/admin_toolbar_tools/admin_toolbar_tools.module
index 2107c0d..bb616e9 100644
--- a/admin_toolbar_tools/admin_toolbar_tools.module
+++ b/admin_toolbar_tools/admin_toolbar_tools.module
@@ -28,6 +28,38 @@ function admin_toolbar_tools_toolbar() {
   // Toolbar item for primary local tasks.
   $items['admin_toolbar_local_tasks'] = \Drupal::service('admin_toolbar_tools.helper')->buildLocalTasksToolbar();
 
+  // Provide separated "Edit" link toolbar item if available.
+  if (!empty($items['admin_toolbar_local_tasks']) && count($items['admin_toolbar_local_tasks'])) {
+    $local_tasks_links = $items['admin_toolbar_local_tasks']['tray']['local_tasks']['#links'];
+    foreach ($local_tasks_links as $route_name => $link) {
+      if (preg_match('/^entity\..+\.edit_form$/', $route_name)) {
+        $class = $link['attributes']['class'] ?? [];
+
+        // The "Edit" button should not be displayed on edit page itself.
+        $is_active = in_array('is-active', $class);
+        if ($is_active) {
+          continue;
+        }
+
+        $items['admin_toolbar_quick_link'] = [
+          '#type' => 'toolbar_item',
+          '#wrapper_attributes' => [
+            'class' => ['local-edit-toolbar-tab'],
+          ],
+          '#weight' => 10,
+          'tab' => [
+            '#type' => 'link',
+            '#title' => $link['title'],
+            '#url' => $link['url'],
+            '#options' => [
+              'attributes' => ['class' => ['toolbar-icon toolbar-icon-edit toolbar-item']],
+            ],
+          ],
+        ];
+      }
+    }
+  }
+
   return $items;
 }
 
diff --git a/css/admin.toolbar.css b/css/admin.toolbar.css
index 090545b..584b139 100644
--- a/css/admin.toolbar.css
+++ b/css/admin.toolbar.css
@@ -150,3 +150,12 @@
 [dir="rtl"] .toolbar-tray-horizontal li.hover-intent ul li {
   float: none;
 }
+
+.toolbar-oriented .toolbar-bar .local-edit-toolbar-tab {
+  float: right;
+}
+
+.toolbar-bar .toolbar-icon-edit:before {
+  background-image: url(../misc/icons/bebebe/pencil.svg);
+  background-position: center left;
+}
diff --git a/misc/icons/bebebe/pencil.svg b/misc/icons/bebebe/pencil.svg
new file mode 100644
index 0000000..cdfe4c2
--- /dev/null
+++ b/misc/icons/bebebe/pencil.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g><path fill="#bebebe" d="M14.545 3.042l-1.586-1.585c-.389-.389-1.025-.389-1.414 0l-1.293 1.293 3 3 1.293-1.293c.389-.389.389-1.026 0-1.415z"/><rect fill="#bebebe" x="5.129" y="3.8" transform="matrix(-.707 -.707 .707 -.707 6.189 20.064)" width="4.243" height="9.899"/><path fill="#bebebe" d="M.908 14.775c-.087.262.055.397.316.312l2.001-.667-1.65-1.646-.667 2.001z"/></g></svg>