diff --git a/.gitignore b/.gitignore
index d42394fd..121e8137 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,5 @@ npm-debug.log
 reports
 cover
 .tox
-src/theme/custom/**.less
\ No newline at end of file
+src/theme/custom/**.less
+src/theme/custom/**.ico
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
index 33818923..aa3cd4e6 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -213,7 +213,7 @@ module.exports = function (grunt) {
                         cwd: dir.source,
                         dest: dir.output,
                         src: [
-                            '**/*.{ico,txt,eot,ttf,woff}',
+                            '**/*.{txt,eot,ttf,woff}',
                             '*.html',
                             'robots.txt'
                         ]
@@ -226,6 +226,14 @@ module.exports = function (grunt) {
                         src: [
                             'fonts/*.*'
                         ]
+                    },
+                    {
+                        src: dir.theme + '/storyboard/favicon.ico',
+                        dest: dir.output + '/favicon.ico'
+                    },
+                    {
+                        src: dir.theme + '/custom/favicon.ico',
+                        dest: dir.output + '/favicon.ico'
                     }
                 ]
             }
diff --git a/src/favicon.ico b/src/theme/storyboard/favicon.ico
similarity index 100%
rename from src/favicon.ico
rename to src/theme/storyboard/favicon.ico