diff --git a/apps/desktop/resources/com.bitwarden.desktop.desktop b/apps/desktop/resources/com.bitwarden.desktop.desktop
index d61387f3e82..1ff4e2b5760 100644
--- a/apps/desktop/resources/com.bitwarden.desktop.desktop
+++ b/apps/desktop/resources/com.bitwarden.desktop.desktop
@@ -4,7 +4,7 @@ Exec=bitwarden %u
 Terminal=false
 Type=Application
 Icon=com.bitwarden.desktop
-StartupWMClass=Bitwarden
+StartupWMClass=com.bitwarden.desktop
 GenericName=Password Manager
 Comment=A secure and free password manager for all of your devices.
 MimeType=x-scheme-handler/bitwarden;
diff --git a/apps/desktop/resources/com.bitwarden.desktop.devel.yaml b/apps/desktop/resources/com.bitwarden.desktop.devel.yaml
index e2e82bc0f39..1e8c393cc1e 100644
--- a/apps/desktop/resources/com.bitwarden.desktop.devel.yaml
+++ b/apps/desktop/resources/com.bitwarden.desktop.devel.yaml
@@ -53,6 +53,7 @@ modules:
       - cp com.bitwarden.desktop.desktop ${FLATPAK_DEST}/share/applications/
       - install bitwarden.sh /app/bin/bitwarden.sh
       - desktop-file-edit --set-key=Exec --set-value="bitwarden.sh %U" ${FLATPAK_DEST}/share/applications/com.bitwarden.desktop.desktop
+      - for s in 16 32 64 128 256 512; do install -Dm644 icons/${s}x${s}.png ${FLATPAK_DEST}/share/icons/hicolor/${s}x${s}/apps/com.bitwarden.desktop.png; done
     sources:
       - type: dir
         only-arches: [x86_64]
@@ -62,6 +63,9 @@ modules:
         path: ../dist/linux-arm64-unpacked
       - type: file
         path: ./com.bitwarden.desktop.desktop
+      - type: dir
+        path: ./icons
+        dest: icons
       - type: script
         dest-filename: bitwarden.sh
         commands: