diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index 22d6805c9..dae00c7d3 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -186,6 +186,7 @@ pref('zen.sidebar.data', "{\"data\":\n {\"p1\":{\n   \"url\":\"https://www.wikip
 pref('zen.sidebar.enabled', true);
 pref('zen.sidebar.close-on-blur', true);
 pref('zen.sidebar.max-webpanels', 8);
+pref('zen.sidebar.use-google-favicons', true);
 
 // Zen Split View
 pref('zen.splitView.enable-tab-drop', true);
diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
index 188886456..4de69a3d5 100644
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -48,6 +48,7 @@
 
     openWatermark() {
       if (!Services.prefs.getBoolPref('zen.watermark.enabled', false)) {
+        document.documentElement.removeAttribute('zen-before-loaded');
         return;
       }
       for (let elem of document.querySelectorAll('#browser > *, #urlbar')) {
diff --git a/src/browser/base/content/zen-fonts/JunicodeVF-Italic.woff2 b/src/browser/base/content/zen-fonts/JunicodeVF-Italic.woff2
index 69ffb1722..e91abe0a5 100644
Binary files a/src/browser/base/content/zen-fonts/JunicodeVF-Italic.woff2 and b/src/browser/base/content/zen-fonts/JunicodeVF-Italic.woff2 differ
diff --git a/src/browser/base/content/zen-fonts/JunicodeVF-Roman.woff2 b/src/browser/base/content/zen-fonts/JunicodeVF-Roman.woff2
index 7e09ffc63..1f1043add 100644
Binary files a/src/browser/base/content/zen-fonts/JunicodeVF-Roman.woff2 and b/src/browser/base/content/zen-fonts/JunicodeVF-Roman.woff2 differ
diff --git a/src/browser/base/content/zen-styles/zen-single-components.css b/src/browser/base/content/zen-styles/zen-single-components.css
index 0c767fe16..efbcaaab1 100644
--- a/src/browser/base/content/zen-styles/zen-single-components.css
+++ b/src/browser/base/content/zen-styles/zen-single-components.css
@@ -19,12 +19,6 @@
   text-overflow: ellipsis;
 }
 
-@media not (-moz-bool-pref: 'zen.watermark.enabled') {
-  #zen-watermark {
-    display: none;
-  }
-}
-
 #customization-footer #customization-toolbar-visibility-button {
   display: none !important;
 }
diff --git a/src/browser/base/zen-components/ZenSidebarManager.mjs b/src/browser/base/zen-components/ZenSidebarManager.mjs
index 292071019..2b695a35d 100644
--- a/src/browser/base/zen-components/ZenSidebarManager.mjs
+++ b/src/browser/base/zen-components/ZenSidebarManager.mjs
@@ -556,16 +556,18 @@ class ZenBrowserManagerSidebar extends ZenDOMOperatedFeature {
   _getWebPanelIcon(url, element) {
     let { preferredURI } = Services.uriFixup.getFixupURIInfo(url);
     element.setAttribute('image', `page-icon:${preferredURI.spec}`);
-    fetch(`https://s2.googleusercontent.com/s2/favicons?domain_url=${preferredURI.spec}`).then(async (response) => {
-      if (response.ok) {
-        let blob = await response.blob();
-        let reader = new FileReader();
-        reader.onload = function () {
-          element.setAttribute('image', reader.result);
-        };
-        reader.readAsDataURL(blob);
-      }
-    });
+    if (Services.prefs.getBoolPref('zen.sidebar.use-google-favicons')) {
+      fetch(`https://s2.googleusercontent.com/s2/favicons?domain_url=${preferredURI.spec}`).then(async (response) => {
+        if (response.ok) {
+          let blob = await response.blob();
+          let reader = new FileReader();
+          reader.onload = function () {
+            element.setAttribute('image', reader.result);
+          };
+          reader.readAsDataURL(blob);
+        }
+      });
+    }
   }
 
   _getBrowserById(id) {
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index ead2073cc..03c18e9aa 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -149,6 +149,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   }
 
   _initializeEmptyTab() {
+    if (Services.prefs.getBoolPref('zen.workspaces.disable_empty_state_for_testing', false)) {
+      return;
+    }
     this._emptyTab = gBrowser.addTrustedTab('about:blank', { inBackground: true, userContextId: 0, _forZenEmptyTab: true });
   }
 
@@ -615,6 +618,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   }
 
   async _selectStartPage() {
+    if (Services.prefs.getBoolPref('zen.workspaces.disable_empty_state_for_testing', false)) {
+      return;
+    }
     const currentTab = gBrowser.selectedTab;
     let showed = false;
     await this.promiseEmptyTabInitialized;
diff --git a/src/browser/base/zen-components/tests/.gitignore b/src/browser/base/zen-components/tests/.gitignore
deleted file mode 100644
index cec9082b6..000000000
--- a/src/browser/base/zen-components/tests/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-
-!.gitignore
diff --git a/src/testing/profiles/mochitest/user-js.patch b/src/testing/profiles/mochitest/user-js.patch
new file mode 100644
index 000000000..3d24992c0
--- /dev/null
+++ b/src/testing/profiles/mochitest/user-js.patch
@@ -0,0 +1,16 @@
+diff --git a/testing/profiles/mochitest/user.js b/testing/profiles/mochitest/user.js
+index a4068ac3f61161d014c49d54ae7a3bf886868f1b..84523e9e10d44269172aa6913699ec50def8166e 100644
+--- a/testing/profiles/mochitest/user.js
++++ b/testing/profiles/mochitest/user.js
+@@ -41,3 +41,11 @@ user_pref("places.history.floodingPrevention.enabled", false);
+ // permission, and we can open it and wait for the user to give permission, then
+ // don't do that.
+ user_pref("geo.prompt.open_system_prefs", false);
++
++user_pref("zen.keyboard.shortcuts.enabled", false);
++user_pref("zen.welcome-screen.seen", true);
++user_pref("zen.tab-unloader.enabled", false);
++user_pref("zen.workspaces.disable_empty_state_for_testing", true);
++user_pref("zen.watermark.enabled", false);
++user_pref("zen.urlbar.replace-newtab", false);
++user_pref("zen.sidebar.use-google-favicons", false); // Crashes on some platforms
diff --git a/src/testing/profiles/profileserver/user-js.patch b/src/testing/profiles/profileserver/user-js.patch
index d18ac8ea3..ce096ae39 100644
--- a/src/testing/profiles/profileserver/user-js.patch
+++ b/src/testing/profiles/profileserver/user-js.patch
@@ -1,8 +1,8 @@
 diff --git a/testing/profiles/profileserver/user.js b/testing/profiles/profileserver/user.js
-index 19ff7d474f6d22d2d386764e2e6942ce6a324470..40d1906bdebd08510014fd6124be17052248e748 100644
+index 19ff7d474f6d22d2d386764e2e6942ce6a324470..a1ed4b51f26f458f965fbc29dfa7b8ad451faf7f 100644
 --- a/testing/profiles/profileserver/user.js
 +++ b/testing/profiles/profileserver/user.js
-@@ -8,3 +8,11 @@
+@@ -8,3 +8,12 @@
  user_pref("dom.timeout.enable_budget_timer_throttling", false);
  // Turn off update
  user_pref("app.update.disabledForTesting", true);
@@ -10,7 +10,8 @@ index 19ff7d474f6d22d2d386764e2e6942ce6a324470..40d1906bdebd08510014fd6124be1705
 +// zen:
 +// Disable some of zen's features to better match the default Firefox experience
 +user_pref("zen.workspaces.disabled_for_testing", true);
-+user_pref("zen.welcome-screen.enabled", false);
++user_pref("zen.workspaces.disable_empty_state_for_testing", true);
++user_pref("zen.welcome-screen.seen", true);
 +user_pref("zen.tab-unloader.enabled", false);
 +user_pref("zen.watermark.enabled", false);
 +user_pref("zen.glance.enabled", false);