diff --git a/src/octoprint/static/img/favicon.svg b/src/octoprint/static/img/favicon.svg
new file mode 100644
index 0000000000..0aebb0e4a0
--- /dev/null
+++ b/src/octoprint/static/img/favicon.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="65.156" height="65.156">
+  <style>
+    path { fill: #383e42; fill-opacity:1 }
+    @media (prefers-color-scheme: dark) {
+      path { fill: #eeeeee; }
+    }
+  </style>
+    <defs></defs><path d="M240.705 371.803c.229 1.318 3.567 1.92 4.985 3.037 1.596 1.255 3.325 2.236 5.732 2.809-.433-.491-.332-.832-.287-1.09 4.299.919 6.131-1.088 5.846-1.145-.536.168-.746.072-.917 0 .745-.574 1.318-2.866 1.088-5.273-1.03 2.35-2.751 2.636-4.07 2.177-1.317-.458-3.551-4.87-4.64-5.96.504-.052 1.115.078 1.433.23-.516-.918-2.064-1.205-4.47-.86.285-.4.801-.917 2.062-1.26-4.355-.23-6.131 3.15-7.163 5.214h-.12c-1.033-2.063-2.809-5.444-7.165-5.215 1.26.344 1.777.86 2.064 1.261-2.408-.345-3.956-.058-4.47.86.316-.152.928-.282 1.432-.23-1.089 1.09-3.324 5.501-4.641 5.96-1.318.46-3.039.173-4.07-2.177-.23 2.407.344 4.7 1.089 5.273-.171.072-.382.168-.918 0-.287.056 1.548 2.064 5.846 1.146.048.258.147.598-.286 1.089 2.407-.573 4.137-1.554 5.73-2.809 1.42-1.117 4.692-1.682 4.987-3.037.326-.358.646-.308.923 0z" transform="translate(-207.731 -329.76)"/><path transform="translate(-12.717 -4.45)" d="M18.193 17.717a.46.46 0 0 0-.476.47v1.973c0 .15.085.44.213.506l1.152.602c.18.093.51.615.578.886l2.777 10.998c.166.658.747 1.19 1.489 1.19h13.781c.853 0 1.801-.52 2.227-1.287l4.636-8.375h1.446l4.638 8.375c.426.768 1.372 1.287 2.225 1.287h13.785c.74 0 1.323-.532 1.488-1.19.141-.552 2.124-8.412 2.756-10.914.12-.476.48-.91.791-1.072l.88-.457a.571.571 0 0 0 .294-.525v-2.041c-.002-.191-.188-.426-.53-.426H49.718c-.625 0-1.581.476-1.88.836a52.793 52.793 0 0 0-1.064 1.388h-2.959s-.766-1.029-1.064-1.388c-.297-.36-1.254-.836-1.879-.836H18.193zm33.37 1.771h15.283c1.1.001 1.857.893 1.681 1.98l-1.455 8.971c-.177 1.088-1.222 1.979-2.324 1.979H54.541c-1.102 0-2.208-.879-2.455-1.953l-2.078-9.024c-.247-1.074.452-1.953 1.554-1.953zm-27.424.002h15.283c1.1 0 1.8.88 1.553 1.953l-2.079 9.024c-.247 1.074-1.352 1.951-2.455 1.951H26.236c-1.102 0-2.149-.89-2.326-1.978l-1.455-8.971c-.177-1.088.581-1.979 1.684-1.979z"/></svg>
\ No newline at end of file
diff --git a/src/octoprint/templates/login.jinja2 b/src/octoprint/templates/login.jinja2
index cdf73bade6..69337bcd70 100644
--- a/src/octoprint/templates/login.jinja2
+++ b/src/octoprint/templates/login.jinja2
@@ -3,7 +3,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>OctoPrint Login</title>
 
-    <link rel="shortcut icon" href="{{ url_for('static', filename='img/tentacle-32x32.png') }}">
+    <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.svg') }}">
     <link rel="mask-icon" href="{{ url_for('static', filename='img/mask.svg') }}" color="#56BE37">
     <link rel="mask-icon-theme" href="{{ url_for('static', filename='img/mask-theme.svg') }}" color="#56BE37">
     <link rel="apple-touch-icon" sizes="114x114" href="{{ url_for('static', filename='img/apple-touch-icon-114x114.png') }}">
@@ -55,7 +55,7 @@
                 {{ _('An account with the following permissions is required:') }} {{ permission_names|join(", ") }}
             </p>{% endif %}
 
-            <input type="text" id="login-user" data-test-id="login-username" class="input-block-level" placeholder="{{ _('Username')|edq }}" autofocus autocapitalize="none">
+            <input type="text" id="login-user" data-test-id="login-username" class="input-block-level" placeholder="{{ _('Email Address')|edq }}" autofocus autocapitalize="none">
             <input type="password" id="login-password" data-test-id="login-password" class="input-block-level" placeholder="{{ _('Password')|edq }}">
             <span class="pull-right"><small>
                 <a href="https://mr-beam.freshdesk.com/support/solutions/articles/43000500137" id="login-forgotpassword" target="_blank" tabindex="-1">