diff --git a/project/__init__.py b/project/__init__.py
index c5083a4..2f1f7b0 100644
--- a/project/__init__.py
+++ b/project/__init__.py
@@ -1,10 +1,11 @@
-from flask import Flask, request
+from flask import Flask, request, send_from_directory
 from flask_sqlalchemy import SQLAlchemy
 from flask_login import LoginManager
 import yaml
 import logging
 import time
 import traceback
+import os
 
 # init SQLAlchemy so we can use it later in our models
 db = SQLAlchemy()
@@ -59,6 +60,12 @@ logger = logging.getLogger('waitress')
 logger.setLevel(app.config['LOGGING_LEVEL'])
 
 
+@app.route('/favicon.ico')
+def favicon():
+    return send_from_directory(os.path.join(app.root_path, 'static'),
+                               'favicon.ico', mimetype='image/vnd.microsoft.icon')
+
+
 @app.before_request
 def before_request():
     timestamp = time.strftime('[%Y-%b-%d %H:%M]')
diff --git a/project/static/favicon.ico b/project/static/favicon.ico
new file mode 100644
index 0000000..2436ae4
Binary files /dev/null and b/project/static/favicon.ico differ
diff --git a/project/templates/base.html b/project/templates/base.html
index c8813a9..661d5b2 100644
--- a/project/templates/base.html
+++ b/project/templates/base.html
@@ -7,6 +7,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <title>Flask</title>
+    <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}"/>
     <link rel="stylesheet"
           href="https://cdn.staticfile.org/twitter-bootstrap/3.3.7/css/bootstrap.min.css"/>
     <link rel="stylesheet"