diff --git a/woodwind/static/logo.png b/woodwind/static/logo.png
new file mode 100644
index 0000000..6d5a2dc
Binary files /dev/null and b/woodwind/static/logo.png differ
diff --git a/woodwind/templates/base.jinja2 b/woodwind/templates/base.jinja2
index 54c7f8f..5c2ea2b 100644
--- a/woodwind/templates/base.jinja2
+++ b/woodwind/templates/base.jinja2
@@ -5,6 +5,11 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Woodwind</title>
   <link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}"/>
+
+
+    <link rel="shortcut icon" href="{{ url_for('static', filename='logo.png') }}"/>
+    <link rel="apple-touch-icon" href="{{ url_for('static', filename='logo.png') }}"/>
+
   <script src="http://code.jquery.com/jquery-2.1.3.min.js"></script>
   {% block head %}{% endblock %}
 </head>
@@ -27,9 +32,13 @@
           (<a href="{{ url_for('.logout') }}">Logout</a>)
         </li>
       </ul>
-      <h1 class="h-x-app">Woodwind</h1>
-    {% else %}
-      <h1 class="h-x-app">Woodwind</h1>
+    {% endif %}
+    <h1 class="h-x-app">
+      <img class="u-logo" src="{{ url_for('static', filename='logo.png') }}" style="max-height: 64px; vertical-align: middle;" />
+        Woodwind
+    </h1>
+
+    {% if not current_user.is_authenticated() %}
       <form action="{{ url_for('.login') }}" method="POST">
         <input type="text" name="me" placeholder="mydomain.com" />
         <input type="hidden" name="next" placeholder="{{ request.path }}" />