diff --git a/webgoat-container/src/main/resources/static/css/img/favicon.ico b/webgoat-container/src/main/resources/static/css/img/favicon.ico
new file mode 100644
index 000000000..bcacd934e
Binary files /dev/null and b/webgoat-container/src/main/resources/static/css/img/favicon.ico differ
diff --git a/webgoat-container/src/main/resources/templates/login.html b/webgoat-container/src/main/resources/templates/login.html
index bee48ffd7..733bcd7c6 100644
--- a/webgoat-container/src/main/resources/templates/login.html
+++ b/webgoat-container/src/main/resources/templates/login.html
@@ -2,6 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
 <head>
     <title th:text="#{login.page.title}">Login Page</title>
+    <link rel="shortcut icon" th:href="@{/css/img/favicon.ico}" type="image/x-icon"/>
     <link rel="stylesheet" type="text/css" th:href="@{/css/main.css}"/>
     <link rel="stylesheet" type="text/css" th:href="@{/plugins/bootstrap/css/bootstrap.min.css}"/>
     <link rel="stylesheet" type="text/css" th:href="@{/css/font-awesome.min.css}"/>
diff --git a/webgoat-container/src/main/resources/templates/main_new.html b/webgoat-container/src/main/resources/templates/main_new.html
index 42bfc698a..ec6d2b87b 100644
--- a/webgoat-container/src/main/resources/templates/main_new.html
+++ b/webgoat-container/src/main/resources/templates/main_new.html
@@ -8,7 +8,7 @@
     <meta http-equiv="Cache-Control" CONTENT="no-store"/>
 
     <!--  CSS -->
-    <link rel="shortcut icon" th:href="@{/images/favicon.ico}" type="image/x-icon"/>
+    <link rel="shortcut icon" th:href="@{/css/img/favicon.ico}" type="image/x-icon"/>
 
     <link rel="stylesheet" type="text/css" th:href="@{/css/main.css}"/>
     <link rel="stylesheet" type="text/css" th:href="@{/plugins/bootstrap/css/bootstrap.min.css}"/>
diff --git a/webwolf/src/main/resources/static/css/img/favicon.ico b/webwolf/src/main/resources/static/css/img/favicon.ico
new file mode 100644
index 000000000..d75680a69
Binary files /dev/null and b/webwolf/src/main/resources/static/css/img/favicon.ico differ
diff --git a/webwolf/src/main/resources/templates/fragments/footer.html b/webwolf/src/main/resources/templates/fragments/footer.html
index 5a536d03b..e7711a19d 100644
--- a/webwolf/src/main/resources/templates/fragments/footer.html
+++ b/webwolf/src/main/resources/templates/fragments/footer.html
@@ -6,11 +6,8 @@
 <div th:fragment="footer">
 
     <div class="container">
-
         <footer>
-            © 2020 WebGoat - Use WebWolf at your own risk
-            <script type="text/javascript"
-                    src="webjars/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+            © 2021 WebGoat - Use WebWolf at your own risk
         </footer>
     </div>
 
diff --git a/webwolf/src/main/resources/templates/fragments/header.html b/webwolf/src/main/resources/templates/fragments/header.html
index d8c3413d8..79f11fe0a 100644
--- a/webwolf/src/main/resources/templates/fragments/header.html
+++ b/webwolf/src/main/resources/templates/fragments/header.html
@@ -2,9 +2,7 @@
 <head>
     <title>WebWolf</title>
     <div th:fragment="header-css">
-        <link rel="stylesheet" type="text/css"
-              href="/webjars/bootstrap/3.3.7/css/bootstrap.min.css"/>
-        <!--<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet"/>-->
+        <link rel="stylesheet" type="text/css" href="/webjars/bootstrap/3.3.7/css/bootstrap.min.css"/>
         <link rel="stylesheet" th:href="@{/css/main.css}"/>
         <script src="/webjars/jquery/3.5.1/jquery.min.js"></script>
         <script src="/webjars/bootstrap/3.3.7/js/bootstrap.min.js"></script>
diff --git a/webwolf/src/main/resources/templates/home.html b/webwolf/src/main/resources/templates/home.html
index e19d5c4d9..886e9a8d1 100644
--- a/webwolf/src/main/resources/templates/home.html
+++ b/webwolf/src/main/resources/templates/home.html
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
+    <link rel="icon" href="/css/img/favicon.ico"/>
     <div th:replace="fragments/header :: header-css"/>
 </head>
 <body>
diff --git a/webwolf/src/main/resources/templates/login.html b/webwolf/src/main/resources/templates/login.html
index 23fe24e79..e41189a16 100644
--- a/webwolf/src/main/resources/templates/login.html
+++ b/webwolf/src/main/resources/templates/login.html
@@ -3,6 +3,7 @@
 >
 <head>
     <title>WebWolf</title>
+    <link rel="icon" href="/css/img/favicon.ico"/>
     <div th:replace="fragments/header :: header-css"/>
 </head>
 <body>
