diff --git a/pkgs/waterfox-bin/default.nix b/pkgs/waterfox-bin/default.nix
index 6a05fe3..8ad4886 100644
--- a/pkgs/waterfox-bin/default.nix
+++ b/pkgs/waterfox-bin/default.nix
@@ -145,7 +145,6 @@ stdenv.mkDerivation (finalAttrs: {
     cp -r . $out/opt/waterfox
 
     makeWrapper $out/opt/waterfox/waterfox-bin $out/bin/waterfox \
-      --set GTK_IM_MODULE gtk-im-context-simple \
       --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}"
 
     cp ${desktopItem}/share/applications/* $out/share/applications/
@@ -160,6 +159,12 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
+    )
+  ''
+
   postInstall = ''
     find $out/opt/waterfox -type f -name "*.so" -exec sh -c '
       if patchelf --print-interpreter "{}" >/dev/null 2>&1; then