diff --git a/Buzz.spec b/Buzz.spec
index 10242e52..f4562cd0 100644
--- a/Buzz.spec
+++ b/Buzz.spec
@@ -1,4 +1,6 @@
 # -*- mode: python ; coding: utf-8 -*-
+import os
+
 from PyInstaller.utils.hooks import collect_data_files, copy_metadata
 
 datas = []
@@ -38,6 +40,7 @@ exe = EXE(
     pyz,
     a.scripts,
     [],
+    icon='./assets/buzz.ico',
     exclude_binaries=True,
     name='Buzz',
     debug=True,
@@ -64,11 +67,10 @@ coll = COLLECT(
 app = BUNDLE(
     coll,
     name='Buzz.app',
-    icon=None,
-    bundle_identifier=None,
-    version='0.0.1',
+    icon='./assets/buzz.icns',
+    bundle_identifier='com.chidiwilliams.buzz',
+    version=os.getenv('BUZZ_VERSION', '0.0.1'),
     info_plist={
-        'NSPrincipalClass': 'NSApplication',
         'NSMicrophoneUsageDescription': 'Please provide microphone access to continue'
     }
 )
diff --git a/Makefile b/Makefile
index 9f32de76..65ceafd3 100644
--- a/Makefile
+++ b/Makefile
@@ -75,11 +75,11 @@ dmg_mac:
 	ditto -x -k "${mac_zip_path}" dist/dmg
 	create-dmg \
 		--volname "Buzz" \
-		--volicon "dist/Buzz.app/Contents/Resources/icon-windowed.icns" \
+		--volicon "./assets/buzz.icns" \
 		--window-pos 200 120 \
 		--window-size 600 300 \
 		--icon-size 100 \
-		--icon "dist/Buzz.app/Contents/Resources/icon-windowed.icns" 175 120 \
+		--icon "./assets/buzz.icns" 175 120 \
 		--hide-extension "Buzz.app" \
 		--app-drop-link 425 120 \
 		--codesign "$$BUZZ_CODESIGN_IDENTITY" \
diff --git a/assets/buzz.icns b/assets/buzz.icns
new file mode 100644
index 00000000..89ae9ae0
Binary files /dev/null and b/assets/buzz.icns differ
diff --git a/assets/buzz.ico b/assets/buzz.ico
new file mode 100644
index 00000000..0d3c1b36
Binary files /dev/null and b/assets/buzz.ico differ