diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
new file mode 100644
index 000000000..b57388622
--- /dev/null
+++ b/docs/_templates/layout.html
@@ -0,0 +1,10 @@
+{% extends "!layout.html" %}
+{% block sidebartitle %}
+    <a href="https://mitmproxy.org/" style="margin-bottom: 7px; background: none !important;">
+        <button class="btn btn-info">
+            <i class="fa fa-arrow-left"></i>
+            Return to mitmproxy.org
+        </button>
+    </a>
+    {{ super() }}
+{% endblock %}
\ No newline at end of file
diff --git a/docs/conf.py b/docs/conf.py
index ff4a4a869..3ea38e482 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -46,7 +46,7 @@ napoleon_include_special_with_doc = False
 autodoc_member_order = "bysource"
 
 # Add any paths that contain templates here, relative to this directory.
-#templates_path = ['_templates']
+templates_path = ['_templates']
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
@@ -128,7 +128,7 @@ html_theme = 'sphinx_rtd_theme'
 # further.  For a list of options available for each theme, see the
 # documentation.
 html_theme_options = {
-    # 'logo_only': True,
+    'logo_only': True,
 }
 
 # Add any paths that contain custom themes here, relative to this directory.
@@ -143,7 +143,7 @@ html_title = "mitmproxy %s documentation" % version
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-html_logo = "mitmproxy-long.png"
+html_logo = "mitmproxy-docs.png"
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
diff --git a/docs/mitmproxy-docs.png b/docs/mitmproxy-docs.png
new file mode 100644
index 000000000..273fb8dbd
Binary files /dev/null and b/docs/mitmproxy-docs.png differ