--- a/browser/modules/BrowserUITelemetry.jsm
+++ b/browser/modules/BrowserUITelemetry.jsm
@@ -47,23 +47,25 @@ const LEGACY_PANEL_PLACEMENTS = [
   "add-ons-button",
   "sync-button",
   "developer-button"
 ];
 
 XPCOMUtils.defineLazyGetter(this, "DEFAULT_AREA_PLACEMENTS", function() {
   let result = {
     "nav-bar": [
+      "back-button",
+      "forward-button",
+      "stop-reload-button",
+      "home-button",
       "urlbar-container",
       "search-container",
       "bookmarks-menu-button",
-      "pocket-button",
       "downloads-button",
-      "home-button",
-      "social-share-button",
+      "sidebar-button",
     ],
     // It's true that toolbar-menubar is not visible
     // on OS X, but the XUL node is definitely present
     // in the document.
     "toolbar-menubar": [
       "menubar-items",
     ],
     "TabsToolbar": [
@@ -71,20 +73,16 @@ XPCOMUtils.defineLazyGetter(this, "DEFAU
       "new-tab-button",
       "alltabs-button",
     ],
     "PersonalToolbar": [
       "personal-bookmarks",
     ],
   };
 
-  if (AppConstants.MOZ_PHOTON_THEME) {
-    result["nav-bar"].push("sidebar-button");
-  }
-
   if (gPhotonStructure) {
     result["widget-overflow-fixed-list"] = [];
   } else {
     result["PanelUI-contents"] = LEGACY_PANEL_PLACEMENTS;
     let showCharacterEncoding = Services.prefs.getComplexValue(
       "browser.menu.showCharacterEncoding",
       Ci.nsIPrefLocalizedString
     ).data;