diff --git a/Makefile b/Makefile
index 16300ce4..91057e19 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,8 @@ release/Herostratus-darwin-x64: .
 		--arch=x64 \
 		--version=$(ELECTRON_VERSION) \
 		--ignore="$(ELECTRON_IGNORE)" \
+		--asar \
+		--icon="assets/icon.icns" \
 		--overwrite \
 		--out=release/
 
@@ -17,6 +19,7 @@ release/Herostratus-linux-ia32: .
 		--arch=ia32 \
 		--version=$(ELECTRON_VERSION) \
 		--ignore="$(ELECTRON_IGNORE)" \
+		--asar \
 		--overwrite \
 		--out=release/
 
@@ -26,6 +29,7 @@ release/Herostratus-linux-x64: .
 		--arch=x64 \
 		--version=$(ELECTRON_VERSION) \
 		--ignore="$(ELECTRON_IGNORE)" \
+		--asar \
 		--overwrite \
 		--out=release/
 
@@ -35,6 +39,8 @@ release/Herostratus-win32-ia32: .
 		--arch=ia32 \
 		--version=$(ELECTRON_VERSION) \
 		--ignore="$(ELECTRON_IGNORE)" \
+		--icon="assets/icon.ico" \
+		--asar \
 		--overwrite \
 		--out=release/
 
@@ -44,6 +50,8 @@ release/Herostratus-win32-x64: .
 		--arch=x64 \
 		--version=$(ELECTRON_VERSION) \
 		--ignore="$(ELECTRON_IGNORE)" \
+		--icon="assets/icon.ico" \
+		--asar \
 		--overwrite \
 		--out=release/
 
diff --git a/assets/icon.icns b/assets/icon.icns
new file mode 100644
index 00000000..09c839ed
Binary files /dev/null and b/assets/icon.icns differ
diff --git a/assets/icon.ico b/assets/icon.ico
new file mode 100644
index 00000000..28840690
Binary files /dev/null and b/assets/icon.ico differ
diff --git a/assets/icon.png b/assets/icon.png
new file mode 100644
index 00000000..4dfeb71c
Binary files /dev/null and b/assets/icon.png differ
diff --git a/lib/herostratus.js b/lib/herostratus.js
index 1fe6024c..3e2cf47e 100644
--- a/lib/herostratus.js
+++ b/lib/herostratus.js
@@ -45,7 +45,8 @@ app.on('ready', function() {
       width: 800,
       height: 380,
       resizable: false,
-      fullscreen: false
+      fullscreen: false,
+      icon: path.join(__dirname, '..', 'assets', 'icon.png')
     });
 
     mainWindow.showUrl(path.join(__dirname, 'index.html'));