diff --git a/css/edit.css b/css/edit.css
index a317c28..4072b9a 100644
--- a/css/edit.css
+++ b/css/edit.css
@@ -391,3 +391,33 @@
   border: 1px solid #cdcdcd;
   box-shadow: 0 2px 1px rgba(0,0,0,0.1);
 }
+
+.drupal-navbar .bar #edit-navbar-tab {
+  display: block;
+  float: right;
+  position: relative;
+}
+
+.drupal-navbar .bar #edit-navbar-tab:hover {
+  background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.125) 20%, transparent 200%);
+  background-image: linear-gradient(rgba(255, 255, 255, 0.125) 20%, transparent 200%);
+}
+
+.drupal-navbar .bar .icon.icon-edit {
+  margin-left: 0;
+  margin-right: 0;
+  padding-left: 0;
+  padding-right: 0;
+  width: 3em;
+  height: 3em;
+  background-image: url("../images/edit.png");
+  background-repeat: no-repeat;
+  background-position: center;
+  overflow: hidden;
+  text-indent: -999px;
+}
+
+.drupal-navbar .bar .icon.icon-edit.active {
+  background-image: url("../images/edit-active.png");
+  background-color: rgb(69,132,221);
+}
diff --git a/edit.module b/edit.module
index c800fca..f2a24b7 100644
--- a/edit.module
+++ b/edit.module
@@ -766,3 +766,42 @@ function theme_edit_wrap_field($variables) {
   }
   return '<'. $el . drupal_attributes($variables['attributes']) . '><' . $el .' class="field-item">' .  $variables['value'] . '</' . $el . '></' . $el . '>';
 }
+
+/**
+ * Implements hook_navbar().
+ */
+function edit_navbar() {
+  $items['edit_navbar'] = array(
+    '#type' => 'navbar_item',
+    'tab' => array(
+      'trigger' => array(
+        '#title' => t('Edit'),
+        '#type' => 'link',
+        '#href' => current_path(),
+        '#options' => array('attributes' => array('id' => 'edit-trigger-link')),
+        '#ajax' => array(
+          'path' => 'edit/metadata',
+          'event' => 'metadatafetch.edit',
+          'progress' => array(),
+        ),
+        '#attached' => array('library' => array(array('edit', 'edit'))),
+        '#theme' => 'html_tag',
+        '#tag' => 'button',
+        '#value_prefix' => '<span class="element-invisible">',
+        '#value_suffix' => '</span>',
+        '#value' => t('Edit'),
+        '#attributes' => array(
+          'class' => array('icon', 'icon-edit'),
+          'id' => 'edit-trigger-link'
+        ),
+      ),
+    ),
+    '#wrapper_attributes' => array(
+      'id' => 'edit-navbar-tab',
+      'class' => array('navbar-tab-edit'),
+    ),
+    '#weight' => 190,
+    '#access' => user_access('access in-place editing'),
+  );
+  return $items;
+}
diff --git a/images/edit-active.png b/images/edit-active.png
new file mode 100644
index 0000000..6dd158d
Binary files /dev/null and b/images/edit-active.png differ
diff --git a/images/edit.png b/images/edit.png
new file mode 100644
index 0000000..eb93320
Binary files /dev/null and b/images/edit.png differ