diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
index 3329e01..bb2561c 100644
--- a/browser/base/content/navigator-toolbox.inc.xhtml
+++ b/browser/base/content/navigator-toolbox.inc.xhtml
@@ -41,16 +41,6 @@
       <hbox flex="1" align="end" class="toolbar-items">
         <toolbartabstop/>
         <hbox id="TabsToolbar-customization-target" flex="1">
-          <toolbarbutton id="firefox-view-button"
-                         class="toolbarbutton-1 chromeclass-toolbar-additional"
-                         data-l10n-id="toolbar-button-firefox-view"
-                         role="button"
-                         aria-pressed="false"
-                         oncommand="FirefoxViewHandler.openTab(event);"
-                         onmousedown="FirefoxViewHandler.openTab(event);"
-                         cui-areatype="toolbar"
-                         removable="true"/>
-
           <tabs id="tabbrowser-tabs"
                 is="tabbrowser-tabs"
                 flex="1"
@@ -703,6 +693,16 @@
                    closemenu="none"
                    cui-areatype="toolbar"
                    data-l10n-id="navbar-library"/>
+
+    <toolbarbutton id="firefox-view-button"
+                   class="toolbarbutton-1 chromeclass-toolbar-additional"
+                   data-l10n-id="toolbar-button-firefox-view"
+                   role="button"
+                   aria-pressed="false"
+                   oncommand="FirefoxViewHandler.openTab(event);"
+                   onmousedown="FirefoxViewHandler.openTab(event);"
+                   cui-areatype="toolbar"
+                   removable="true"/>
   </html:template>
 </toolbox>
 </box>
diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm
index e97c979..1f0a0ce 100644
--- a/browser/components/customizableui/CustomizableUI.jsm
+++ b/browser/components/customizableui/CustomizableUI.jsm
@@ -297,7 +297,6 @@ var CustomizableUIInternal = {
       {
         type: CustomizableUI.TYPE_TOOLBAR,
         defaultPlacements: [
-          "firefox-view-button",
           "tabbrowser-tabs",
           "new-tab-button",
           "alltabs-button",
@@ -626,18 +625,6 @@ var CustomizableUIInternal = {
         navbarPlacements.splice(newPosition, 0, "save-to-pocket-button");
       }
     }
-
-    // Add firefox-view if not present
-    if (currentVersion < 18) {
-      let tabstripPlacements =
-        gSavedState.placements[CustomizableUI.AREA_TABSTRIP];
-      if (
-        tabstripPlacements &&
-        !tabstripPlacements.includes("firefox-view-button")
-      ) {
-        tabstripPlacements.unshift("firefox-view-button");
-      }
-    }
   },
 
   _updateForNewProtonVersion() {
diff --git a/browser/components/firefoxview/firefoxview.html b/browser/components/firefoxview/firefoxview.html
index 403891d..f7a9027 100644
--- a/browser/components/firefoxview/firefoxview.html
+++ b/browser/components/firefoxview/firefoxview.html
@@ -117,7 +117,7 @@
         </div>
       </template>
 
-      <details class="content-container" is="tab-pickup-container" id="tab-pickup-container" open>
+      <details class="content-container" is="tab-pickup-container" id="tab-pickup-container" open hidden="true">
         <summary class="page-section-header">
           <span class="twisty icon" data-l10n-id="firefoxview-collapse-button-hide" aria-role="presentation"></span>
           <h1 id="collapsible-synced-tabs-header" data-l10n-id="firefoxview-tabpickup-header"></h1>
@@ -145,7 +145,7 @@
         </div>
       </details>
 
-      <aside id="colorway-landmark" class="content-container" is="colorways-card">
+      <aside id="colorway-landmark" class="content-container" is="colorways-card" hidden="true">
         <template id="colorways-no-collection-template">
           <div class="content-container">
             <div id="no-current-colorway-collection-notice" data-l10n-id="firefoxview-no-current-colorway-collection"></div>
diff --git a/browser/components/firefoxview/firefoxview.mjs b/browser/components/firefoxview/firefoxview.mjs
index bee8589..985c91c 100644
--- a/browser/components/firefoxview/firefoxview.mjs
+++ b/browser/components/firefoxview/firefoxview.mjs
@@ -28,7 +28,26 @@ const MediaQueryDOMSorting = {
   },
 };
 
+function onPrefChange() {
+  document.getElementById("tab-pickup-container").hidden =
+    Services.prefs.getBoolPref("identity.fxaccounts.enabled") &&
+    !Services.prefs.getBoolPref("librewolf.firefoxView.hideTabPickup", false)
+      ? false
+      : true;
+  document.getElementById("colorway-landmark").hidden =
+    !Services.prefs.getBoolPref("librewolf.firefoxView.hideColorways", true)
+      ? false
+      : true;
+}
+
+[
+  "librewolf.firefoxView.hideTabPickup",
+  "librewolf.firefoxView.hideColorways",
+  "identity.fxaccounts.enabled",
+].forEach((pref) => Services.prefs.addObserver(pref, onPrefChange));
+
 window.addEventListener("DOMContentLoaded", async () => {
+  onPrefChange();
   Services.telemetry.setEventRecordingEnabled("firefoxview", true);
   Services.telemetry.recordEvent("firefoxview", "entered", "firefoxview", null);
   document.getElementById("recently-closed-tabs-container").onLoad();
diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
index 17c5f96..aff9c0b 100644
--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
@@ -81,57 +81,6 @@ const BASE_MESSAGES = () => [
     },
     trigger: { id: "protectionsPanelOpen" },
   },
-  {
-    id: "CFR_FIREFOX_VIEW",
-    groups: ["cfr"],
-    template: "cfr_doorhanger",
-    //If Firefox View button has been moved to the overflow menu, we want to change the anchor element
-    content: {
-      bucket_id: "CFR_FIREFOX_VIEW",
-      anchor_id: "firefox-view-button",
-      alt_anchor_id: "nav-bar-overflow-button",
-      layout: "icon_and_message",
-      icon: "chrome://browser/content/cfr-lightning.svg",
-      icon_dark_theme: "chrome://browser/content/cfr-lightning-dark.svg",
-      icon_class: "cfr-doorhanger-small-icon",
-      heading_text: {
-        string_id: "firefoxview-cfr-header",
-      },
-      text: {
-        string_id: "firefoxview-cfr-body",
-      },
-      buttons: {
-        primary: {
-          label: {
-            string_id: "firefoxview-cfr-primarybutton",
-          },
-          action: {
-            type: "OPEN_FIREFOX_VIEW",
-            navigate: true,
-          },
-        },
-        secondary: [
-          {
-            label: {
-              string_id: "firefoxview-cfr-secondarybutton",
-            },
-            action: {
-              type: "CANCEL",
-            },
-          },
-        ],
-      },
-      skip_address_bar_notifier: true,
-    },
-    frequency: {
-      lifetime: 1,
-    },
-    trigger: {
-      id: "nthTabClosed",
-    },
-    // Avoid breaking existing tests that close tabs for now.
-    targeting: `!inMr2022Holdback && fxViewButtonAreaType != null && (currentDate|date - profileAgeCreated) / 86400000 >= 2 && tabsClosedCount >= 3 && 'browser.firefox-view.view-count'|preferenceValue == 0 && !'browser.newtabpage.activity-stream.asrouter.providers.cfr'|preferenceIsUserSet`,
-  },
   {
     id: "FX_MR_106_UPGRADE",
     template: "spotlight",