--- a/browser/base/content/test/social/browser.ini
+++ b/browser/base/content/test/social/browser.ini
@@ -27,16 +27,17 @@ support-files =
   social_worker.js
   unchecked.jpg
 
 [browser_aboutHome_activation.js]
 [browser_addons.js]
 skip-if = e10s && debug # Leaking docshells (bug 1150147)
 [browser_blocklist.js]
 skip-if = e10s && debug # Leaking docshells (bug 1150147)
+[browser_pocket_ui_check.js]
 [browser_share.js]
 skip-if = true # bug 1115131
 [browser_social_activation.js]
 skip-if = e10s && debug # e10s/Linux/Debug Leaking docshells (bug 1150147)
 [browser_social_chatwindow.js]
 skip-if = true # Bug 1245798 'document-element-inserted' is not fired for chat windows anymore, so no mozSocial
 [browser_social_chatwindow_resize.js]
 skip-if = true # Bug 1245798 'document-element-inserted' is not fired for chat windows anymore, so no mozSocial

new file mode 100644
--- /dev/null
+++ b/browser/base/content/test/social/browser_pocket_ui_check.js
@@ -0,0 +1,21 @@
+"use strict";
+
+add_task(function*() {
+  let pocketAddon = yield new Promise(resolve => {
+    AddonManager.getAddonByID("firefox@getpocket.com", resolve);
+  });
+  if (!pocketAddon) {
+    ok(true, "Pocket is not installed");
+    return;
+  }
+  if (!Services.prefs.getBoolPref("extensions.pocket.enabled")) {
+    ok(true, "Pocket add-on is not enabled");
+    return;
+  }
+
+  for (let id of ["panelMenu_pocket", "menu_pocket", "BMB_pocket",
+                  "panelMenu_pocketSeparator", "menu_pocketSeparator",
+                  "BMB_pocketSeparator"]) {
+    ok(document.getElementById(id), "Should see element with id " + id);
+  }
+});

--- a/browser/extensions/pocket/bootstrap.js
+++ b/browser/extensions/pocket/bootstrap.js
@@ -417,17 +417,17 @@ var PocketOverlay = {
       let sep = createElementWithAttrs(document, "menuseparator", {
         "id": "menu_pocketSeparator"
       });
       sib.parentNode.insertBefore(menu, sib);
       sib.parentNode.insertBefore(sep, sib);
     }
 
     // add to bookmarks-menu-button
-    sib = document.getElementById("BMB_subscribeToPageMenuitem");
+    sib = document.getElementById("BMB_bookmarksToolbar");
     if (sib && !document.getElementById("BMB_pocket")) {
       let menu = createElementWithAttrs(document, "menuitem", {
         "id": "BMB_pocket",
         "label": gPocketBundle.GetStringFromName("pocketMenuitem.label"),
         "class": "menuitem-iconic bookmark-item subviewbutton",
         "oncommand": "openUILink(Pocket.listURL, event);"
       });
       let sep = createElementWithAttrs(document, "menuseparator", {