diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000000..70b00c4301
Binary files /dev/null and b/public/favicon.ico differ
diff --git a/src/webserver.js b/src/webserver.js
index 68a4f51601..ea4a96f322 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -32,7 +32,7 @@ var express = require('express'),
 	};
 
 	// Middlewares
-	app.use(express.favicon());	// 2 args: string path and object options (i.e. expire time etc)
+	app.use(express.favicon(path.join(__dirname, '../', 'public', 'favicon.ico')));
 	app.use(require('less-middleware')({ src: path.join(__dirname, '../', 'public') }));
 	app.use(express.static(path.join(__dirname, '../', 'public')));
 	app.use(express.bodyParser());	// Puts POST vars in request.body