diff --git a/.github/workflows/build_macos.yaml b/.github/workflows/build_macos.yaml
index fdd569a69b..246fcce2c9 100644
--- a/.github/workflows/build_macos.yaml
+++ b/.github/workflows/build_macos.yaml
@@ -75,6 +75,10 @@ jobs:
         runs-on: macos-15 # M1
         environment: ${{ inputs.sign && 'packages.element.io' || '' }}
         steps:
+            - uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1
+              with:
+                  xcode-version: latest-stable
+
             - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
               with:
                   repository: element-hq/element-desktop
diff --git a/build/icon.icns b/build/icon.icns
deleted file mode 100644
index 4f9a8f97ef..0000000000
Binary files a/build/icon.icns and /dev/null differ
diff --git a/build/icon.icon/Assets/element.png b/build/icon.icon/Assets/element.png
new file mode 100644
index 0000000000..cfbd8c600a
Binary files /dev/null and b/build/icon.icon/Assets/element.png differ
diff --git a/build/icon.icon/icon.json b/build/icon.icon/icon.json
new file mode 100644
index 0000000000..bb701f6a0e
--- /dev/null
+++ b/build/icon.icon/icon.json
@@ -0,0 +1,29 @@
+{
+  "fill" : "automatic",
+  "groups" : [
+    {
+      "layers" : [
+        {
+          "glass" : false,
+          "image-name" : "element.png",
+          "name" : "element"
+        }
+      ],
+      "name" : "Figma",
+      "shadow" : {
+        "kind" : "none",
+        "opacity" : 0.5
+      },
+      "specular" : false,
+      "translucency" : {
+        "enabled" : false,
+        "value" : 0.5
+      }
+    }
+  ],
+  "supported-platforms" : {
+    "squares" : [
+      "macOS"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/electron-builder.ts b/electron-builder.ts
index 0c819a7569..9038882cce 100644
--- a/electron-builder.ts
+++ b/electron-builder.ts
@@ -158,7 +158,7 @@ const config: Omit<Writable<Configuration>, "electronFuses"> & {
         gatekeeperAssess: true,
         strictVerify: true,
         entitlements: "./build/entitlements.mac.plist",
-        icon: "build/icon.icns",
+        icon: "build/icon.icon",
         mergeASARs: true,
         x64ArchFiles: "**/matrix-seshat/*.node", // hak already runs lipo
     },