diff --git a/src/wuttaweb/static/img/favicon.ico b/src/wuttaweb/static/img/favicon.ico
new file mode 100644
index 0000000..2b7edf1
Binary files /dev/null and b/src/wuttaweb/static/img/favicon.ico differ
diff --git a/src/wuttaweb/static/img/logo.png b/src/wuttaweb/static/img/logo.png
new file mode 100644
index 0000000..96fae96
Binary files /dev/null and b/src/wuttaweb/static/img/logo.png differ
diff --git a/src/wuttaweb/templates/base.mako b/src/wuttaweb/templates/base.mako
index f6b4206..7aba37c 100644
--- a/src/wuttaweb/templates/base.mako
+++ b/src/wuttaweb/templates/base.mako
@@ -151,9 +151,11 @@
 
             <div class="navbar-brand">
               <a class="navbar-item" href="${url('home')}">
-                ${base_meta.header_logo()}
-                <div id="global-header-title">
-                  ${base_meta.global_title()}
+                <div style="display: flex; gap: 0.3rem; align-items: center;">
+                  ${base_meta.header_logo()}
+                  <div id="global-header-title">
+                    ${base_meta.global_title()}
+                  </div>
                 </div>
               </a>
               <a role="button" class="navbar-burger" data-target="navbar-menu" aria-label="menu" aria-expanded="false">
diff --git a/src/wuttaweb/templates/base_meta.mako b/src/wuttaweb/templates/base_meta.mako
index 4e62198..c65e68c 100644
--- a/src/wuttaweb/templates/base_meta.mako
+++ b/src/wuttaweb/templates/base_meta.mako
@@ -7,11 +7,15 @@
 <%def name="extra_styles()"></%def>
 
 <%def name="favicon()">
-  ## <link rel="icon" type="image/x-icon" href="${config.get('tailbone', 'favicon_url', default=request.static_url('wuttaweb:static/img/favicon.ico'))}" />
+  <link rel="icon" type="image/x-icon" href="${config.get('wuttaweb.favicon_url', default=request.static_url('wuttaweb:static/img/favicon.ico'))}" />
 </%def>
 
 <%def name="header_logo()">
-  ## ${h.image(config.get('wuttaweb.header_image_url', default=request.static_url('wuttaweb:static/img/logo.png')), "Header Logo", style="height: 49px;")}
+  ${h.image(config.get('wuttaweb.header_logo_url', default=request.static_url('wuttaweb:static/img/favicon.ico')), "Header Logo", style="height: 49px;")}
+</%def>
+
+<%def name="full_logo()">
+  ${h.image(config.get('wuttaweb.logo_url', default=request.static_url('wuttaweb:static/img/logo.png')), f"{app.get_title()} logo")}
 </%def>
 
 <%def name="footer()">
diff --git a/src/wuttaweb/templates/home.mako b/src/wuttaweb/templates/home.mako
index 61a4eb2..1bb5f0d 100644
--- a/src/wuttaweb/templates/home.mako
+++ b/src/wuttaweb/templates/home.mako
@@ -9,11 +9,9 @@
 </%def>
 
 <%def name="page_content()">
-  <div style="height: 100%; display: flex; align-items: center; justify-content: center;">
-    <div class="logo">
-      ## ${h.image(image_url, "{} logo".format(capture(base_meta.app_title)))}
-      <h1 class="is-size-1">Welcome to ${base_meta.app_title()}</h1>
-    </div>
+  <div style="height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 1rem;">
+    <div>${base_meta.full_logo()}</div>
+    <h1 class="is-size-1">Welcome to ${app.get_title()}</h1>
   </div>
 </%def>
 
diff --git a/src/wuttaweb/templates/login.mako b/src/wuttaweb/templates/login.mako
index b50a863..6f07542 100644
--- a/src/wuttaweb/templates/login.mako
+++ b/src/wuttaweb/templates/login.mako
@@ -1,5 +1,6 @@
 ## -*- coding: utf-8; -*-
 <%inherit file="/form.mako" />
+<%namespace name="base_meta" file="/base_meta.mako" />
 
 <%def name="title()">Login</%def>
 
@@ -8,7 +9,8 @@
 </%def>
 
 <%def name="page_content()">
-  <div style="height: 100%; display: flex; align-items: center; justify-content: center;">
+  <div style="height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 1rem;">
+    <div>${base_meta.full_logo()}</div>
     <div class="card">
       <div class="card-content">
         ${form.render_vue_tag()}