diff --git a/static/favicon.ico b/static/favicon.ico
new file mode 100644
index 0000000..b074392
Binary files /dev/null and b/static/favicon.ico differ
diff --git a/static/img/estus.png b/static/img/estus.png
new file mode 100644
index 0000000..cf64954
Binary files /dev/null and b/static/img/estus.png differ
diff --git a/static/img/solaire300x300.png b/static/img/solaire300x300.png
new file mode 100644
index 0000000..a6309d9
Binary files /dev/null and b/static/img/solaire300x300.png differ
diff --git a/templates/base.html b/templates/base.html
index bf75225..a40b268 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -7,6 +7,8 @@
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
   <link rel="stylesheet" href="/static/dark_theme.css">
   <link rel="stylesheet" href="/static/custom.css">
+
+  <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
 {% endblock %}
 
 {% block navbar %}
diff --git a/templates/login.html b/templates/login.html
index a1c082f..b4dd4df 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -6,13 +6,13 @@
   {{ super() }}
   <link rel="stylesheet" href="/static/dark_theme.css">
   <link rel="stylesheet" href="/static/custom.css">
+  <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
 {% endblock %}
 
 {% block body_attribs %}
-  style="background-image: url(/static/img/elite.png);
-    background-repeat: no-repeat;
-    background-position-x: left;
-    background-position-y: bottom;"
+  style="background-image: url(/static/img/elite.png), url(/static/img/solaire300x300.png);
+    background-repeat: no-repeat, no-repeat;
+    background-position: left bottom, right bottom;"
 {% endblock %}
 
 {% block content %}
@@ -20,7 +20,7 @@
   <div class="container vertical-center">
     <div class="card text-center mx-auto" style="width: 15rem">
 
-      <img src="/static/img/solaire.png" alt="Login" style="height: 15rem">
+      <img src="/static/img/estus.png" alt="Login" style="height: 15rem">
 
       <div class="card-body">
         <form method="post">