diff --git a/customize.dist/alt-favicon-code.png b/customize.dist/favicon/alt-favicon-code.png
similarity index 100%
rename from customize.dist/alt-favicon-code.png
rename to customize.dist/favicon/alt-favicon-code.png
diff --git a/customize.dist/alt-favicon-kanban.png b/customize.dist/favicon/alt-favicon-kanban.png
similarity index 100%
rename from customize.dist/alt-favicon-kanban.png
rename to customize.dist/favicon/alt-favicon-kanban.png
diff --git a/customize.dist/alt-favicon-richtext.png b/customize.dist/favicon/alt-favicon-pad.png
similarity index 100%
rename from customize.dist/alt-favicon-richtext.png
rename to customize.dist/favicon/alt-favicon-pad.png
diff --git a/customize.dist/alt-favicon-poll.png b/customize.dist/favicon/alt-favicon-poll.png
similarity index 100%
rename from customize.dist/alt-favicon-poll.png
rename to customize.dist/favicon/alt-favicon-poll.png
diff --git a/customize.dist/alt-favicon-sheets.png b/customize.dist/favicon/alt-favicon-sheet.png
similarity index 100%
rename from customize.dist/alt-favicon-sheets.png
rename to customize.dist/favicon/alt-favicon-sheet.png
diff --git a/customize.dist/alt-favicon-slide.png b/customize.dist/favicon/alt-favicon-slide.png
similarity index 100%
rename from customize.dist/alt-favicon-slide.png
rename to customize.dist/favicon/alt-favicon-slide.png
diff --git a/customize.dist/alt-favicon-whiteboard.png b/customize.dist/favicon/alt-favicon-whiteboard.png
similarity index 100%
rename from customize.dist/alt-favicon-whiteboard.png
rename to customize.dist/favicon/alt-favicon-whiteboard.png
diff --git a/customize.dist/alt-favicon.png b/customize.dist/favicon/alt-favicon.png
similarity index 100%
rename from customize.dist/alt-favicon.png
rename to customize.dist/favicon/alt-favicon.png
diff --git a/customize.dist/favicon_source.svg b/customize.dist/favicon/favicon_source.svg
similarity index 100%
rename from customize.dist/favicon_source.svg
rename to customize.dist/favicon/favicon_source.svg
diff --git a/customize.dist/main-favicon-code.png b/customize.dist/favicon/main-favicon-code.png
similarity index 100%
rename from customize.dist/main-favicon-code.png
rename to customize.dist/favicon/main-favicon-code.png
diff --git a/customize.dist/main-favicon-kanban.png b/customize.dist/favicon/main-favicon-kanban.png
similarity index 100%
rename from customize.dist/main-favicon-kanban.png
rename to customize.dist/favicon/main-favicon-kanban.png
diff --git a/customize.dist/main-favicon-richtext.png b/customize.dist/favicon/main-favicon-pad.png
similarity index 100%
rename from customize.dist/main-favicon-richtext.png
rename to customize.dist/favicon/main-favicon-pad.png
diff --git a/customize.dist/main-favicon-poll.png b/customize.dist/favicon/main-favicon-poll.png
similarity index 100%
rename from customize.dist/main-favicon-poll.png
rename to customize.dist/favicon/main-favicon-poll.png
diff --git a/customize.dist/main-favicon-sheets.png b/customize.dist/favicon/main-favicon-sheet.png
similarity index 100%
rename from customize.dist/main-favicon-sheets.png
rename to customize.dist/favicon/main-favicon-sheet.png
diff --git a/customize.dist/main-favicon-slide.png b/customize.dist/favicon/main-favicon-slide.png
similarity index 100%
rename from customize.dist/main-favicon-slide.png
rename to customize.dist/favicon/main-favicon-slide.png
diff --git a/customize.dist/main-favicon-whiteboard.png b/customize.dist/favicon/main-favicon-whiteboard.png
similarity index 100%
rename from customize.dist/main-favicon-whiteboard.png
rename to customize.dist/favicon/main-favicon-whiteboard.png
diff --git a/customize.dist/favicon/main-favicon.png b/customize.dist/favicon/main-favicon.png
new file mode 100644
index 000000000..ce110f883
Binary files /dev/null and b/customize.dist/favicon/main-favicon.png differ
diff --git a/www/common/notify.js b/www/common/notify.js
index a3c8cd2b8..0e0361fb3 100644
--- a/www/common/notify.js
+++ b/www/common/notify.js
@@ -1,8 +1,12 @@
 define(['/api/config'], function (ApiConfig) {
     var Module = {};
 
-    var DEFAULT_MAIN = '/customize/main-favicon.png?' + ApiConfig.requireConf.urlArgs;
-    var DEFAULT_ALT = '/customize/alt-favicon.png?' + ApiConfig.requireConf.urlArgs;
+    var apps = ['code', 'slide', 'pad', 'kanban', 'whiteboard', 'sheet', 'poll'];
+    var app = window.location.pathname.slice(1, -1); // remove "/" at the beginnin and the end
+    var suffix = apps.indexOf(app) !== -1 ? '-'+app : '';
+
+    var DEFAULT_MAIN = '/customize/favicon/main-favicon' + suffix + '.png?' + ApiConfig.requireConf.urlArgs;
+    var DEFAULT_ALT = '/customize/favicon/alt-favicon' + suffix + '.png?' + ApiConfig.requireConf.urlArgs;
 
     var document = window.document;