diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js
index c6a3a6e2cae5..898e93f40a16 100644
--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -113,6 +113,7 @@ var gExceptionPaths = [
   "resource://builtin-addons/formautofill/",
 
   // The newtab add-on
+  "resource://builtin-addons/newtab/",
   "resource://newtab/",
   "chrome://newtab/",
 ];
diff --git a/browser/base/content/test/static/browser_parsable_css.js b/browser/base/content/test/static/browser_parsable_css.js
index fba525f1c364..9e5c659e05fe 100644
--- a/browser/base/content/test/static/browser_parsable_css.js
+++ b/browser/base/content/test/static/browser_parsable_css.js
@@ -550,7 +550,7 @@ add_task(async function checkAllTheCSS() {
     if (imageHost == "browser") {
       for (let ref of references) {
         let refHost = ref.split("/")[2];
-        if (!["newtab", "browser"].includes(refHost)) {
+        if (!["builtin-addons", "newtab", "browser"].includes(refHost)) {
           ok(
             false,
             "browser file " + image + " referenced outside browser in " + ref
diff --git a/browser/extensions/newtab/addon-jar.mn b/browser/extensions/newtab/addon-jar.mn
index acf1a343d77a..66010dbc13e6 100644
--- a/browser/extensions/newtab/addon-jar.mn
+++ b/browser/extensions/newtab/addon-jar.mn
@@ -3,8 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 browser.jar:
-% resource newtab %builtin-addons contentaccessible=yes
-% content newtab %content/builtin-addons contentaccessible=yes
   builtin-addons/newtab/manifest.json (./manifest.json)
   builtin-addons/newtab/webext-glue/background.js (./webext-glue/background.js)
   builtin-addons/newtab/webext-glue/schema.json (./webext-glue/schema.json)
diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn
index abd30cb3b602..e0692a81a558 100644
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -95,8 +95,18 @@ browser/defaults/settings/main/search-config-icons/fed4f021-ff3e-942a-010e-afa43
 
 # Bug 1946262 - De-Duplicate by moving glyph svg icons in a shared location
 browser/chrome/browser/content/browser/asrouter/assets/glyph-mail-16.svg
+#ifdef BROWSER_NEWTAB_AS_ADDON
+browser/chrome/browser/builtin-addons/newtab/data/data/content/assets/glyph-mail-16.svg
+#else
 browser/chrome/browser/content/newtab/data/content/assets/glyph-mail-16.svg
+#endif
 
 # Bug 1946597 - Move glyph-webextension-16.svg in browser/themes/shared/icons
 browser/chrome/browser/content/activity-stream/data/content/assets/glyph-webextension-16.svg
 browser/chrome/browser/content/newtab/data/content/assets/glyph-webextension-16.svg
+
+#ifdef BROWSER_NEWTAB_AS_ADDON
+# Bug 1946564 - Remove once newtab's schema.json changes.
+browser/features/formautofill@mozilla.org/schema.json
+browser/chrome/browser/builtin-addons/newtab/webext-glue/schema.json
+#endif