diff --git a/circle.yml b/circle.yml
index 535d4756..01675651 100644
--- a/circle.yml
+++ b/circle.yml
@@ -2,12 +2,8 @@ dependencies:
   cache_directories:
     - ~/.electron
   post:
-    - gulp package
-    - mv release/electron-mattermost-win32-ia32 release/electron-mattermost-win32
-    - mv release/electron-mattermost-win32-x64 release/electron-mattermost-win64
+    - gulp package:osx
     - mv release/electron-mattermost-darwin-x64 release/electron-mattermost-osx
-    - cd release && zip -r /$CIRCLE_ARTIFACTS/electron-mattermost-win32.zip electron-mattermost-win32
-    - cd release && zip -r /$CIRCLE_ARTIFACTS/electron-mattermost-win64.zip electron-mattermost-win64
     - tar zcvf /$CIRCLE_ARTIFACTS/electron-mattermost-osx.tar.gz -C release electron-mattermost-osx
 
 test:
diff --git a/electron-mattermost.icns b/electron-mattermost.icns
new file mode 100644
index 00000000..03cd8a05
Binary files /dev/null and b/electron-mattermost.icns differ
diff --git a/electron-mattermost.png b/electron-mattermost.png
new file mode 100644
index 00000000..1ea0cf09
Binary files /dev/null and b/electron-mattermost.png differ
diff --git a/gulpfile.js b/gulpfile.js
index 6db82283..1a59955c 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -35,18 +35,19 @@ gulp.task('serve', function() {
   });
 });
 
-gulp.task('package', ['sync-meta'], function() {
+function makePackage(platform, arch) {
   var packageJson = require('./src/package.json');
   packager({
     dir: './src',
     name: packageJson.name,
-    platform: ['win32', 'darwin'],
-    arch: 'all',
+    platform: platform,
+    arch: arch,
     version: '0.33.6',
     out: './release',
     prune: true,
     overwrite: true,
-    "app-version": packageJson.version
+    "app-version": packageJson.version,
+    icon: 'electron-mattermost'
   }, function(err, appPath) {
     if (err) {
       console.log(err);
@@ -55,6 +56,22 @@ gulp.task('package', ['sync-meta'], function() {
       console.log('done');
     }
   });
+};
+
+gulp.task('package', ['sync-meta'], function() {
+  makePackage('all', 'all');
+});
+
+gulp.task('package:windows', ['sync-meta'], function() {
+  makePackage('win32', 'all');
+});
+
+gulp.task('package:osx', ['sync-meta'], function() {
+  makePackage('darwin', 'all');
+});
+
+gulp.task('package:linux', ['sync-meta'], function() {
+  makePackage('linux', 'all');
 });
 
 gulp.task('sync-meta', function() {