diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix
index ecf08a529d17..652695b83e05 100644
--- a/pkgs/applications/window-managers/i3/lock-fancy.nix
+++ b/pkgs/applications/window-managers/i3/lock-fancy.nix
@@ -12,14 +12,15 @@ stdenv.mkDerivation rec {
     sha256 = "0az43nqhmbniih3yw9kz5lnky0n7mxylvklsib76s4l2alf6i3ps";
   };
   patchPhase = ''
-    sed -i -e "s|mktemp|${coreutils}/bin/mktemp|" lock
-    sed -i -e "s|\`pwd\`|$out/share/i3lock-fancy|" lock
-    sed -i -e "s|dirname|${coreutils}/bin/dirname|" lock
-    sed -i -e "s|rm |${coreutils}/bin/rm |" lock
-    sed -i -e "s|scrot |${scrot}/bin/scrot |" lock
+    sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" lock
+    sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" lock
+    sed -i -e "s|scrot -z |${scrot}/bin/scrot -z |" lock
     sed -i -e "s|convert |${imagemagick}/bin/convert |" lock
-    sed -i -e "s|awk |${gawk}/bin/awk|" lock
-    sed -i -e "s|i3lock |${i3lock-color}/bin/i3lock-color |" lock
+    sed -i -e "s|awk -F|${gawk}/bin/awk -F|" lock
+    sed -i -e "s| awk | ${gawk}/bin/awk |" lock
+    sed -i -e "s|i3lock -n |${i3lock-color}/bin/i3lock-color -n |" lock
+    sed -i -e 's|ICON="$SCRIPTPATH/lockdark.png"|ICON="'$out'/share/i3lock-fancy/lockdark.png"|' lock
+    sed -i -e 's|ICON="$SCRIPTPATH/lock.png"|ICON="'$out'/share/i3lock-fancy/lock.png"|' lock
   '';
   installPhase = ''
     mkdir -p $out/bin $out/share/i3lock-fancy