diff --git a/resources/win/atom.png b/resources/atom.png
similarity index 100%
rename from resources/win/atom.png
rename to resources/atom.png
diff --git a/tasks/build-task.coffee b/tasks/build-task.coffee
index 3ea047635..d7a41b776 100644
--- a/tasks/build-task.coffee
+++ b/tasks/build-task.coffee
@@ -22,6 +22,9 @@ module.exports = (grunt) ->
     cp 'atom.sh', path.join(appDir, 'atom.sh')
     cp 'package.json', path.join(appDir, 'package.json')
 
+    iconPath = path.resolve(__dirname, '..', 'resources', 'atom.png')
+    cp iconPath, path.join(appDir, 'atom.png')
+
     packageDirectories = []
     nonPackageDirectories = [
       'benchmark'
diff --git a/tasks/set-exe-icon-task.coffee b/tasks/set-exe-icon-task.coffee
index 6ffe6ed40..09bc2b67b 100644
--- a/tasks/set-exe-icon-task.coffee
+++ b/tasks/set-exe-icon-task.coffee
@@ -1,18 +1,12 @@
 path = require 'path'
 
 module.exports = (grunt) ->
-  {cp} = require('./task-helpers')(grunt)
-
   grunt.registerTask 'set-exe-icon', 'Set icon of the exe', ->
     done = @async()
 
     shellAppDir = grunt.config.get('atom.shellAppDir')
-    appDir = grunt.config.get('atom.appDir')
     shellExePath = path.join(shellAppDir, 'atom.exe')
     iconPath = path.resolve(__dirname, '..', 'resources', 'win', 'atom.ico')
-    pngPath = path.resolve(__dirname, '..', 'resources', 'win', 'atom.png')
-
-    cp pngPath, path.join(appDir, 'atom.png')
 
     rcedit = require('rcedit')
     rcedit(shellExePath, {'icon': iconPath}, done)