diff --git a/www-client/icecat/Manifest b/www-client/icecat/Manifest
index 8030812..5720c1f 100644
--- a/www-client/icecat/Manifest
+++ b/www-client/icecat/Manifest
@@ -1,3 +1,4 @@
 DIST firefox-91esr-patches-05j.tar.xz 17116 BLAKE2B 5db6d2d3d5432369d2cfcda1a2b542d70ac18c1af7013d91984054c9658d7e3f989527c3a248de53f2e8dc51a852a46477f9ad75e98db28f50f8609fcafe547c SHA512 42080a8e28014d5f8de7ff45e0128ab71747faad7a92f0f7094686125835c168751794bd0229f77290f075502c271af0171ffae2863325d10cc6e8a853a90d3e
-DIST icecat-91.6.0-gnu1.tar.bz2 569356704 BLAKE2B 8855751a99e86eed6e0e254cb0984f67481eda7f1d85d357778c1516e4f3e266801422f4d2b478fd08a09ea36f632b61b9706ff2376b3910688defd644ab2238 SHA512 9e2cc46cd14c9b57cd492e99ab3443a341950cf726d86022e7861bb51b58e15e39736564c34247ecf3bfaa363da9227284e63a6873d2b894ca3951ce6d67ad10
+DIST firefox-91esr-patches-06j.tar.xz 17668 BLAKE2B ebe51e06197b70b0f0661724e1ccf2f2aaf0e0eb4576e795963c6a0f9c32f293825b8d2a487dcadd8e5e1cb5db7c756016c50f34e6bc6df451b44e54ef76686e SHA512 3af533a49c5e4a6fdb5be2225256655d402055332ba98f3aa159fcc78c4a9901a541b63d68cb02440f55ede04858388881118f655efebc75b18c316e0ab522a7
 DIST icecat-91.7.0-gnu1.tar.bz2 569508756 BLAKE2B c77f5d35c148d88eac58c8db195041605f34a14d29c58279875c6599791596e2eaf96c999d7842f1942859fec571e506d9f3c031b211a85dfd3dd4a16d035bdb SHA512 59172d5f07722406349f2f49cd7411b71da674d1afe2840b75fde09682d53158f3c24c5ca71d971d9f5b70ae6a3b95b28818a788a3887fa897c13ff67193fa6e
+DIST icecat-91.8.0-gnu1.tar.bz2 569227383 BLAKE2B e7d644db85dd721636be3e14b10ad0939b00f902cf107ee508427c627a23b0e149b93a09199f01534fa13a12e16164c8d2472566a0798a998c4f4bda44e7c546 SHA512 1c55418e4c14bec7d8e79e8e4daa919d0e17629a5117593392bc32c4b5973bd7ccc69a38d3f2ff4c13c9ccbd3d890de0c5eea95e33a212b87129eef4552af081
diff --git a/www-client/icecat/icecat-91.6.0.ebuild b/www-client/icecat/icecat-91.8.0.ebuild
similarity index 97%
rename from www-client/icecat/icecat-91.6.0.ebuild
rename to www-client/icecat/icecat-91.8.0.ebuild
index 10c5571..5ff039a 100644
--- a/www-client/icecat/icecat-91.6.0.ebuild
+++ b/www-client/icecat/icecat-91.8.0.ebuild
@@ -6,7 +6,7 @@
 EAPI="7"
 
 # Using Gentoos firefox patches as system libraries and lto are quite nice
-FIREFOX_PATCHSET="firefox-91esr-patches-05j.tar.xz"
+FIREFOX_PATCHSET="firefox-91esr-patches-06j.tar.xz"
 
 LLVM_MAX_SLOT=13
 
@@ -115,7 +115,7 @@ COMMON_DEPEND="
 	>=dev-libs/libffi-3.0.10:=
 	media-video/ffmpeg
 	x11-libs/libX11
-	x11-libs/libxcb
+	x11-libs/libxcb:=
 	x11-libs/libXcomposite
 	x11-libs/libXdamage
 	x11-libs/libXext
@@ -458,19 +458,9 @@ pkg_setup() {
 			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
 			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
 
-			# temp fix for https://bugs.gentoo.org/768543
-			# we can assume that rust 1.{49,50}.0 always uses llvm 11
-			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
-			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
-			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
-
-			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
-				local version_llvm_rust="11"
-			else
-				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-			fi
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
 
 			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
 				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
@@ -555,7 +545,18 @@ src_unpack() {
 }
 
 src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+	if use lto; then
+		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
+	fi
+
+	if use system-av1 && has_version "<media-libs/dav1d-1.0.0"; then
+		rm -v "${WORKDIR}"/firefox-patches/0033-bgo-835788-dav1d-1.0.0-support.patch || die
+		elog "<media-libs/dav1d-1.0.0 detected, removing 1.0.0 compat patch."
+	elif ! use system-av1; then
+		rm -v "${WORKDIR}"/firefox-patches/0033-bgo-835788-dav1d-1.0.0-support.patch || die
+		elog "-system-av1 USE flag detected, removing 1.0.0 compat patch."
+	fi
+
 	eapply "${WORKDIR}/firefox-patches"
 
 	# Allow user to apply any additional patches without modifing ebuild