diff --git a/.github/workflows/oneclient_nightly.yml b/.github/workflows/oneclient_nightly.yml
index e7249aff..de4dc2ec 100644
--- a/.github/workflows/oneclient_nightly.yml
+++ b/.github/workflows/oneclient_nightly.yml
@@ -115,6 +115,23 @@ jobs:
             exit 1
           fi
 
+      - name: (macOS) Compile app icon catalog
+        if: startsWith(matrix.platform, 'macos')
+        shell: bash
+        run: |
+          set -euo pipefail
+          out="packages/oneclient_app/icons/generated"
+          mkdir -p "$out"
+          xcrun actool packages/oneclient_app/icons/OneClient.icon \
+            --compile "$out" \
+            --app-icon OneClient \
+            --output-partial-info-plist "$out/partial.plist" \
+            --platform macosx \
+            --minimum-deployment-target 26.0 \
+            --errors --warnings --notices
+          rm -f "$out/OneClient.icns"
+          test -f "$out/Assets.car" || { echo "::error::actool produced no Assets.car"; exit 1; }
+
       - name: Package (unsigned)
         shell: bash
         env:
diff --git a/.github/workflows/oneclient_release.yml b/.github/workflows/oneclient_release.yml
index 9cc21dc3..f6775d7e 100644
--- a/.github/workflows/oneclient_release.yml
+++ b/.github/workflows/oneclient_release.yml
@@ -328,6 +328,23 @@ jobs:
             exit 1
           }
 
+      - name: (macOS) Compile app icon catalog
+        if: startsWith(matrix.platform, 'macos')
+        shell: bash
+        run: |
+          set -euo pipefail
+          out="packages/oneclient_app/icons/generated"
+          mkdir -p "$out"
+          xcrun actool packages/oneclient_app/icons/OneClient.icon \
+            --compile "$out" \
+            --app-icon OneClient \
+            --output-partial-info-plist "$out/partial.plist" \
+            --platform macosx \
+            --minimum-deployment-target 26.0 \
+            --errors --warnings --notices
+          rm -f "$out/OneClient.icns"
+          test -f "$out/Assets.car" || { echo "::error::actool produced no Assets.car"; exit 1; }
+
       - name: Package
         shell: bash
         env:
diff --git a/.gitignore b/.gitignore
index 3c2fd1d4..a3d27549 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 .DS_Store
 /.idea
 OneLauncher.iml
+
+/packages/oneclient_app/icons/generated/
diff --git a/packages/oneclient_app/Cargo.toml b/packages/oneclient_app/Cargo.toml
index ef0ddefc..c0ee6795 100644
--- a/packages/oneclient_app/Cargo.toml
+++ b/packages/oneclient_app/Cargo.toml
@@ -77,6 +77,7 @@ icons = [
   "icons/icon.icns",
   "icons/icon.ico",
 ]
+resources = [{ src = "icons/generated/Assets.car", target = "Assets.car" }]
 
 [package.metadata.packager.macos]
 minimum-system-version = "10.14"
diff --git a/packages/oneclient_app/distribution/Info.plist b/packages/oneclient_app/distribution/Info.plist
index 35472329..52b863f3 100644
--- a/packages/oneclient_app/distribution/Info.plist
+++ b/packages/oneclient_app/distribution/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
     <dict>
+        <key>CFBundleIconName</key>
+        <string>OneClient</string>
         <!-- registers our uri handler on macos -->
         <key>CFBundleURLTypes</key>
         <array>
diff --git a/packages/oneclient_app/icons/OneClient.icon/Assets/oneclient-mark.svg b/packages/oneclient_app/icons/OneClient.icon/Assets/oneclient-mark.svg
new file mode 100644
index 00000000..2f96ddac
--- /dev/null
+++ b/packages/oneclient_app/icons/OneClient.icon/Assets/oneclient-mark.svg
@@ -0,0 +1,7 @@
+<svg width="197" height="187" viewBox="0 0 197 187" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M82.1674 0H68.9678C53.8201 0 39.8231 8.07288 32.2493 21.1777L2.6905 72.3224C1.67829 74.0738 0.801358 75.8795 0.0597031 77.725L42.054 69.9967C59.011 66.876 72.2789 53.6217 75.4028 36.6822L82.1674 0Z" fill="#0048C5"/>
+<path d="M0 109.126C0.754162 111.023 1.651 112.879 2.6905 114.678L32.2493 165.822C39.8231 178.927 53.8201 187 68.9678 187H82.1929L75.4028 150.179C72.2789 133.24 59.011 119.986 42.0541 116.865L0 109.126Z" fill="#0048C5"/>
+<path d="M115.529 187H128.085C143.233 187 157.23 178.927 164.804 165.822L194.363 114.678C195.378 112.921 196.257 111.11 197 109.259L155.668 116.865C138.711 119.986 125.443 133.24 122.319 150.179L115.529 187Z" fill="#0048C5"/>
+<path d="M196.94 77.592C196.209 75.7927 195.35 74.0317 194.363 72.3224L164.804 21.1777C157.23 8.07287 143.233 0 128.085 0H115.555L122.319 36.6822C125.443 53.6217 138.711 66.876 155.668 69.9967L196.94 77.592Z" fill="#0048C5"/>
+<path d="M98.4478 3.6693C98.5032 3.17751 99.2186 3.17751 99.2739 3.6693L102.544 32.7134C105.876 62.3151 129.227 85.6977 158.851 89.0973L193.019 93.0183C193.51 93.0746 193.51 93.787 193.019 93.8433L158.851 97.7644C129.227 101.164 105.876 124.547 102.544 154.148L99.2739 183.192C99.2186 183.684 98.5032 183.684 98.4478 183.192L95.1833 154.194C91.8485 124.571 68.4679 101.18 38.8198 97.8037L4.03907 93.8434C3.5476 93.7874 3.5476 93.0742 4.03907 93.0182L38.8198 89.0579C68.4679 85.6821 91.8485 62.2903 95.1833 32.6676L98.4478 3.6693Z" fill="#0A5BE8"/>
+</svg>
diff --git a/packages/oneclient_app/icons/OneClient.icon/icon.json b/packages/oneclient_app/icons/OneClient.icon/icon.json
new file mode 100644
index 00000000..b3ad6298
--- /dev/null
+++ b/packages/oneclient_app/icons/OneClient.icon/icon.json
@@ -0,0 +1,38 @@
+{
+  "fill": "automatic",
+  "groups": [
+    {
+      "layers": [
+        {
+          "blend-mode": "normal",
+          "fill": "automatic",
+          "glass": true,
+          "hidden": false,
+          "image-name": "oneclient-mark.svg",
+          "name": "oneclient-mark",
+          "position": {
+            "scale": 3.6,
+            "translation-in-points": [
+              0,
+              0
+            ]
+          }
+        }
+      ],
+      "shadow": {
+        "kind": "neutral",
+        "opacity": 0.5
+      },
+      "translucency": {
+        "enabled": true,
+        "value": 0.5
+      }
+    }
+  ],
+  "supported-platforms": {
+    "circles": [
+      "watchOS"
+    ],
+    "squares": "shared"
+  }
+}