diff --git a/app.py b/app.py
index 1333743eb3816882be5f05679efc8575e0533670..d8e85193eb9bbbd4e239fafc9b58ed6397d34d43 100644
--- a/app.py
+++ b/app.py
@@ -1,7 +1,7 @@
 from flask import Flask
 from flask import render_template
 
-app = Flask(__name__)
+app = Flask(__name__, template_folder="static/templates")
 
 @app.route('/')
 def home():
diff --git a/static/icons/favicon.ico b/static/icons/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a4326218ced146e11b3643e95245799aac5fd484
Binary files /dev/null and b/static/icons/favicon.ico differ
diff --git a/templates/index.html b/static/templates/index.html
similarity index 72%
rename from templates/index.html
rename to static/templates/index.html
index d8ab780cb6e27bcaea7a156f3b1e369ce8afa025..91f0930d43cf341dd8620a1d19a78e24bb7eb53d 100644
--- a/templates/index.html
+++ b/static/templates/index.html
@@ -3,6 +3,7 @@
     <head>
         <title>Space Station Chatbot</title>
         <meta charset="UTF-8">
+        <link rel="icon" type="image/x-icon" href="static/icons/favicon.ico">
     </head>
 
     <body>