diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 03293322..642b4205 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,8 @@ jobs:
     - name: Set env to beta
       if: contains(github.ref, '-beta.') || contains(github.ref, '-rc.')
       run: |
-        echo "REACT_APP_NAME=Pybricks Code (Beta)" >> $GITHUB_ENV
+        echo "REACT_APP_NAME=Pybricks Beta" >> $GITHUB_ENV
+        echo "REACT_APP_SUFFIX=-beta" >> $GITHUB_ENV
     - uses: actions/setup-node@v1
       with:
         node-version: '12.x'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e544bd6d..4cebb7c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Changed
 - Changed snippet (autocomplete) content and behavior [issue#471].
 - Changed gutter background color [issue#472].
+- Added *BETA` badge to application icon [support#375].
 
 ### Fixed
 - Fixed auto-indent not working [issue#470].
@@ -46,6 +47,7 @@ Prerelease changes are documented at [support#48].
 [issue#471]: https://github.com/pybricks/pybricks-code/issues/471
 [issue#472]: https://github.com/pybricks/pybricks-code/issues/472
 [support#48]: https://github.com/pybricks/support/issues/48
+[support#375]: https://github.com/pybricks/support/issues/375
 [support#378]: https://github.com/pybricks/support/issues/378
 [v3.0.0]: https://github.com/pybricks/pybricks-micropython/blob/master/CHANGELOG.md#300---2021-06-08
 [v3.1.0a1]: https://github.com/pybricks/pybricks-micropython/blob/master/CHANGELOG.md#310a1---2021-06-23
diff --git a/public/logo192-beta.png b/public/logo192-beta.png
new file mode 100644
index 00000000..c7e98174
Binary files /dev/null and b/public/logo192-beta.png differ
diff --git a/public/logo192m-beta.png b/public/logo192m-beta.png
new file mode 100644
index 00000000..f402c9a8
Binary files /dev/null and b/public/logo192m-beta.png differ
diff --git a/public/logo512-beta.png b/public/logo512-beta.png
new file mode 100644
index 00000000..d6c72776
Binary files /dev/null and b/public/logo512-beta.png differ
diff --git a/public/manifest.json b/public/manifest.json
index b347bf6a..17901a91 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -3,24 +3,19 @@
     "name": "%REACT_APP_NAME%",
     "icons": [
         {
-            "src": "favicon.ico",
-            "sizes": "64x64 32x32 24x24 16x16",
-            "type": "image/x-icon"
-        },
-        {
-            "src": "logo192.png",
+            "src": "logo192%REACT_APP_SUFFIX%.png",
             "type": "image/png",
             "sizes": "192x192",
             "purpose": "any"
         },
         {
-            "src": "logo192m.png",
+            "src": "logo192m%REACT_APP_SUFFIX%.png",
             "type": "image/png",
             "sizes": "192x192",
             "purpose": "maskable"
         },
         {
-            "src": "logo512.png",
+            "src": "logo512%REACT_APP_SUFFIX%.png",
             "type": "image/png",
             "sizes": "512x512"
         }