diff --git a/app/static/favicon.ico b/app/static/favicon.ico
new file mode 100644
index 0000000..9aa2454
Binary files /dev/null and b/app/static/favicon.ico differ
diff --git a/app/static/favicon_orange.ico b/app/static/favicon_orange.ico
new file mode 100644
index 0000000..c326d7c
Binary files /dev/null and b/app/static/favicon_orange.ico differ
diff --git a/app/static/logo.png b/app/static/logo.png
index c0cbb8d..9aa2454 100644
Binary files a/app/static/logo.png and b/app/static/logo.png differ
diff --git a/app/static/logo_orange.png b/app/static/logo_orange.png
new file mode 100644
index 0000000..c326d7c
Binary files /dev/null and b/app/static/logo_orange.png differ
diff --git a/app/views/__init__.py b/app/views/__init__.py
index 63a34e6..c70dd24 100644
--- a/app/views/__init__.py
+++ b/app/views/__init__.py
@@ -1,7 +1,8 @@
 from datetime import datetime, timedelta
 
-from flask import url_for, render_template, abort
+from flask import url_for, render_template, abort, send_from_directory
 from flask_login import login_required
+import os
 
 from app import app
 from models import Order, Location
@@ -45,6 +46,14 @@ def profile():
     return render_template('profile.html')
 
 
+@app.route('/favicon.ico')
+def favicon():
+    if len(get_orders((Order.stoptime > datetime.now()))) == 0:
+        return send_from_directory(os.path.join(app.root_path, 'static'), 'favicon.ico', mimetype='image/x-icon')
+    else:
+        return send_from_directory(os.path.join(app.root_path, 'static'), 'favicon_orange.ico', mimetype='image/x-icon')
+
+
 if app.debug:  # add route information
     @app.route('/routes')
     @login_required