diff --git a/gulpfile.js b/gulpfile.js
index d3da8bea5..611fef19c 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1334,6 +1334,11 @@ gulp.task(
       const CHROME_BUILD_DIR = BUILD_DIR + "/chromium/",
         CHROME_BUILD_CONTENT_DIR = CHROME_BUILD_DIR + "/content/";
 
+      const CHROME_WEB_FILES = [
+        ...COMMON_WEB_FILES,
+        "!web/images/toolbarButton-openFile.svg",
+      ];
+
       // Clear out everything in the chrome extension build directory
       rimraf.sync(CHROME_BUILD_DIR);
 
@@ -1353,7 +1358,7 @@ gulp.task(
           gulp.dest(CHROME_BUILD_CONTENT_DIR + "web")
         ),
         gulp
-          .src(COMMON_WEB_FILES, { base: "web/" })
+          .src(CHROME_WEB_FILES, { base: "web/" })
           .pipe(gulp.dest(CHROME_BUILD_CONTENT_DIR + "web")),
 
         gulp
diff --git a/web/app.js b/web/app.js
index 532ddb1a0..bd9951e70 100644
--- a/web/app.js
+++ b/web/app.js
@@ -2195,9 +2195,6 @@ function webViewerInitialized() {
         fileInput: evt.dataTransfer,
       });
     });
-  } else if (!PDFJSDev.test("MOZCENTRAL")) {
-    appConfig.toolbar.openFile.hidden = true;
-    appConfig.secondaryToolbar.openFileButton.hidden = true;
   }
 
   if (!PDFViewerApplication.supportsDocumentFonts) {
diff --git a/web/secondary_toolbar.js b/web/secondary_toolbar.js
index 40bfa88bc..e43c5b4d7 100644
--- a/web/secondary_toolbar.js
+++ b/web/secondary_toolbar.js
@@ -135,7 +135,7 @@ class SecondaryToolbar {
         close: true,
       },
     ];
-    if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")) {
+    if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
       this.buttons.push({
         element: options.openFileButton,
         eventName: "openfile",
diff --git a/web/toolbar.js b/web/toolbar.js
index 8fa02f78b..79f60716a 100644
--- a/web/toolbar.js
+++ b/web/toolbar.js
@@ -70,7 +70,7 @@ class Toolbar {
       { element: options.download, eventName: "download" },
       { element: options.viewBookmark, eventName: null },
     ];
-    if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")) {
+    if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
       this.buttons.push({ element: options.openFile, eventName: "openfile" });
     }
     this.items = {
diff --git a/web/viewer.html b/web/viewer.html
index b6d0c83af..cb698cf0f 100644
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -153,7 +153,7 @@ See https://github.com/adobe-type-tools/cmap-resources
               <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
             </button>
 
-<!--#if !MOZCENTRAL-->
+<!--#if GENERIC-->
             <button id="secondaryOpenFile" class="secondaryToolbarButton visibleLargeView" title="Open File" tabindex="52" data-l10n-id="open_file">
               <span data-l10n-id="open_file_label">Open</span>
             </button>
@@ -267,7 +267,7 @@ See https://github.com/adobe-type-tools/cmap-resources
                   <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
                 </button>
 
-<!--#if !MOZCENTRAL-->
+<!--#if GENERIC-->
                 <button id="openFile" class="toolbarButton hiddenLargeView" title="Open File" tabindex="32" data-l10n-id="open_file">
                   <span data-l10n-id="open_file_label">Open</span>
                 </button>
@@ -453,7 +453,7 @@ See https://github.com/adobe-type-tools/cmap-resources
     </div> <!-- outerContainer -->
     <div id="printContainer"></div>
 
-<!--#if GENERIC -->
+<!--#if GENERIC-->
     <input type="file" id="fileInput" class="hidden">
 <!--#endif-->
   </body>
diff --git a/web/viewer.js b/web/viewer.js
index 5ea6dd345..ee56f8377 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -89,7 +89,7 @@ function getViewerConfiguration() {
       zoomOut: document.getElementById("zoomOut"),
       viewFind: document.getElementById("viewFind"),
       openFile:
-        typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")
+        typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")
           ? document.getElementById("openFile")
           : null,
       print: document.getElementById("print"),
@@ -104,7 +104,7 @@ function getViewerConfiguration() {
         "secondaryPresentationMode"
       ),
       openFileButton:
-        typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")
+        typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")
           ? document.getElementById("secondaryOpenFile")
           : null,
       printButton: document.getElementById("secondaryPrint"),