diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f938c6e64..679f6e860 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -174,7 +174,7 @@ jobs:
           cp rundir/RelWithDebInfo/bin/obs-ffmpeg-mux ./OBS.app/Contents/MacOS
           cp rundir/RelWithDebInfo/bin/libobsglad.0.dylib ./OBS.app/Contents/MacOS
           cp -R rundir/RelWithDebInfo/data ./OBS.app/Contents/Resources
-          cp ../CI/scripts/macos/app/obs.icns ./OBS.app/Contents/Resources
+          cp ../CI/scripts/macos/app/AppIcon.icns ./OBS.app/Contents/Resources
           cp -R rundir/RelWithDebInfo/obs-plugins/ ./OBS.app/Contents/PlugIns
           cp ../CI/scripts/macos/app/Info.plist ./OBS.app/Contents
 
diff --git a/CI/full-build-macos.sh b/CI/full-build-macos.sh
index 090e5963f..f00092dd9 100755
--- a/CI/full-build-macos.sh
+++ b/CI/full-build-macos.sh
@@ -383,7 +383,7 @@ prepare_macos_bundle() {
     cp rundir/${BUILD_CONFIG}/bin/obs-ffmpeg-mux ./OBS.app/Contents/MacOS
     cp rundir/${BUILD_CONFIG}/bin/libobsglad.0.dylib ./OBS.app/Contents/MacOS
     cp -R rundir/${BUILD_CONFIG}/data ./OBS.app/Contents/Resources
-    cp ${CI_SCRIPTS}/app/obs.icns ./OBS.app/Contents/Resources
+    cp ${CI_SCRIPTS}/app/AppIcon.icns ./OBS.app/Contents/Resources
     cp -R rundir/${BUILD_CONFIG}/obs-plugins/ ./OBS.app/Contents/PlugIns
     cp ${CI_SCRIPTS}/app/Info.plist ./OBS.app/Contents
     # Scripting plugins are required to be placed in same directory as binary
diff --git a/CI/scripts/macos/app/AppIcon.icns b/CI/scripts/macos/app/AppIcon.icns
new file mode 100644
index 000000000..b4cf117ed
Binary files /dev/null and b/CI/scripts/macos/app/AppIcon.icns differ
diff --git a/CI/scripts/macos/app/Info.plist b/CI/scripts/macos/app/Info.plist
index 3d9214a9d..4f19a3d46 100644
--- a/CI/scripts/macos/app/Info.plist
+++ b/CI/scripts/macos/app/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleIconFile</key>
-	<string>obs.icns</string>
+	<string>AppIcon.icns</string>
 	<key>CFBundleName</key>
 	<string>OBS</string>
 	<key>CFBundleGetInfoString</key>
diff --git a/CI/scripts/macos/app/big_sur_icon_template.psd b/CI/scripts/macos/app/big_sur_icon_template.psd
new file mode 100644
index 000000000..71af91dd1
Binary files /dev/null and b/CI/scripts/macos/app/big_sur_icon_template.psd differ
diff --git a/CI/scripts/macos/package/settings.json.template b/CI/scripts/macos/package/settings.json.template
index 4bcc0764c..de39e030f 100644
--- a/CI/scripts/macos/package/settings.json.template
+++ b/CI/scripts/macos/package/settings.json.template
@@ -1,7 +1,7 @@
 {
     "title": "OBS-Studio $$VERSION$$",
     "background": "$$CI_PATH$$/package/background.tiff",
-    "icon": "$$CI_PATH$$/app/obs.icns",
+    "icon": "$$CI_PATH$$/app/AppIcon.icns",
     "format": "ULFO",
     "icon-size": 96,
     "window": {
diff --git a/UI/forms/images/obs_256x256.png b/UI/forms/images/obs_256x256.png
new file mode 100644
index 000000000..2b264dde0
Binary files /dev/null and b/UI/forms/images/obs_256x256.png differ