diff --git a/element-desktop b/element-desktop
index 7d95337..fb2931e 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 7d95337b9b4847752b4d7ffac8a894c7bdc7d7ac
+Subproject commit fb2931eb808d99995a4cd5ef168e8d4697f39e3f
diff --git a/element-web b/element-web
index 702182d..904c637 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 702182d503b5afdb262634384606797dde103a4d
+Subproject commit 904c6378682d314fe91bf536b6207c6d5e320459
diff --git a/nix/schildichat-desktop.nix b/nix/schildichat-desktop.nix
index 5805091..89c3936 100644
--- a/nix/schildichat-desktop.nix
+++ b/nix/schildichat-desktop.nix
@@ -31,6 +31,17 @@ in mkYarnPackage {
     ln -s $seshat node_modules/matrix-seshat
   '';
 
+  distPhase = "true";
+  desktopItem = makeDesktopItem {
+    name = "schildichat-desktop";
+    exec = "schildichat-desktop %u";
+    icon = "schildichat";
+    desktopName = "SchildiChat";
+    genericName = "Matrix Client";
+    categories = "Network;InstantMessaging;Chat;";
+    extraEntries = "StartupWMClass=schildichat\nMimeType=x-scheme-handler/element;";
+  };
+
   installPhase = ''
     mkdir -p "$out/share/element"
     ln -s '${schildichat-web}' "$out/share/element/webapp"
@@ -46,21 +57,7 @@ in mkYarnPackage {
       ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/element.png"
     done
 
-    mkdir -p "$out/share"
-    ln -s "${desktopItem}/share/applications" "$out/share/applications"
-
     makeWrapper '${electron_exec}' "$out/bin/schildichat-desktop" \
       --add-flags "$out/share/element/electron${lib.optionalString useWayland " --enable-features=UseOzonePlatform --ozone-platform=wayland"}"
   '';
-
-  distPhase = "true";
-  desktopItem = makeDesktopItem {
-    name = "schildichat-desktop";
-    exec = "schildichat-desktop %u";
-    icon = "schildichat";
-    desktopName = "SchildiChat";
-    genericName = "Matrix Client";
-    categories = "Network;InstantMessaging;Chat;";
-    extraEntries = "StartupWMClass=schildichat\nMimeType=x-scheme-handler/element;";
-  };
 }
\ No newline at end of file