diff --git a/Makefile b/Makefile
index 5a897e6..e2f261b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
+.PHONY: all setup regenerate-i18n reskindex web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
 .PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release
 .PHONY: macos-common macos macos-mas macos-release macos-mas-release icns
 .PHONY: clean
@@ -60,8 +60,12 @@ icns: element-desktop/build/icon.icns element-desktop/build/dmg.icns
 regenerate-i18n: setup
 	./regenerate_i18n.sh
 
+reskindex: setup
+	$(YARN) --cwd matrix-react-sdk reskindex
+	$(YARN) --cwd element-web reskindex
+
 web: export DIST_VERSION=$(WEB_OUT_DIST_VERSION)
-web: setup
+web: setup reskindex
 	cp $(CFGDIR)/config.json element-web/
 	$(YARN) --cwd element-web dist
 	echo "$(VERSION)" > element-web/webapp/version
diff --git a/element-desktop b/element-desktop
index e8271ec..0ee1a2a 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit e8271ec368dea7b706f072b83171f8db1bc548c9
+Subproject commit 0ee1a2ad165615e6c3e15a2bbde7f3895977cef8
diff --git a/element-web b/element-web
index f87ee44..b4f26a6 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit f87ee443e4be1d496a6034137660f53e6778d918
+Subproject commit b4f26a6c52c76b4a6139051470820b41066ff289
diff --git a/matrix-js-sdk b/matrix-js-sdk
index c696abf..e82be9f 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit c696abff7507dfce8e94a6db14a4b4693895b0e2
+Subproject commit e82be9fc93f409acaa257f6b317ac9cbb7bab9d5
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 8245acd..cea7c0e 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 8245acd053cb8fcbe8789d43afe70204a15a1deb
+Subproject commit cea7c0e1006b859a3fdebe2e32423319c1986d74