diff --git a/overlays/nixpak/firefox.nix b/overlays/nixpak/firefox.nix
index 57c5457..68783ff 100644
--- a/overlays/nixpak/firefox.nix
+++ b/overlays/nixpak/firefox.nix
@@ -76,21 +76,11 @@
     };
   in
     prev.wrapFirefox (sandboxed-firefox-esr.config.env // {
-      gtk3 = prev.gtk3;
-      inherit (prev.firefox-esr)
-        pname
-        meta
-        tests
-        version
-        langPath
-        updateScript
-        pkgconfig
-        buildPackages
-        patches
-        extraPatches
-        extraPrefs
-        extraPolicies
-        nativeMessagingHosts
-        cfg;
-    }) {};
+      inherit (prev.firefox-esr) stdenv lib callPackage fetchurl nixosTests buildMozillaMach;
+    }) {
+      nameSuffix = "-esr";
+      desktopName = "Firefox ESR";
+      wmClass = "firefox-esr";
+      icon = "firefox-esr";
+    };
 }