diff --git a/docs/_static/custom.css b/docs/_static/custom.css
index 29c9acc..0ca28fc 100644
--- a/docs/_static/custom.css
+++ b/docs/_static/custom.css
@@ -1,23 +1,33 @@
-img.logo {
-    margin-right: 0;
-    padding-left: 7px;
-}
-
-h1.logo a {
+/* Hide theme's default logo section */
+.logo a {
     display: none;
 }
 
-#gh-buttons {
-    margin-bottom: 2em;
+#logo a,
+#logo a:hover {
+    border-bottom: none;
 }
 
-h1.logo-text {
+#logo img {
+    margin: -32px 0 0 2px;
+    padding: 0;
+}
+
+#gh-buttons {
+    margin-top: 2em;
+}
+
+#logo-text {
     font-family: "Amethysta", "goudy old style", serif;
-    color: #333;
+    font-weight: bold;
+
+    font-size: 18pt;
+    color: #444;
     position: absolute;
-    z-index: 10;
-    top: 10px;
-    font-size: 20pt;
+
+    left: 9px;
+    top: 1px;
+    /*margin: -4px -4px 0 0;*/
 }
 
 div.body h1,
@@ -25,12 +35,56 @@ div.body h2,
 div.body h3,
 div.body h4,
 div.body h5,
-div.body h6 {
+div.body h6,
+div.sphinxsidebar h3 {
     font-family: "Amethysta", "goudy old style", serif;
     font-weight: bold;
-    color: #333;
+    color: #444;
 }
 
-table.field-list th {
-    width: 95px;
+div.sphinxsidebar h3 {
+    margin: 1.5em 0 0 0;
+}
+
+div input[type="text"] {
+    padding: 5px;
+    margin: 0 0 0.5em 0;
+    font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif;
+}
+
+div input[type="submit"] {
+    font-size: 12px;
+    width: 64px;
+    height: 27px;
+    font-weight: 600;
+    font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif;
+
+    border: 1px solid #d5d5d5;
+    border-radius: 3px;
+    padding: 0 10px;
+
+    color: #333;
+    background-color: #eee;
+    background-image: linear-gradient(to bottom,#fcfcfc,#eee);
+}
+
+div input[type="submit"]:hover {
+    background-color: #ddd;
+    background-image: linear-gradient(to bottom,#eee,#ddd);
+    border-color: #ccc;
+}
+
+div input[type="submit"]:active, #searchbox input[type="submit"]:active {
+    background-color: #dcdcdc;
+    background-image: none;
+    border-color: #b5b5b5;
+    box-shadow: inset 0 2px 4px rgba(0,0,0,.15);
+}
+
+div input[type="submit"]:focus {
+    outline: none;
+}
+
+input[type=text]:focus {
+    outline: 1px solid #999;
 }
diff --git a/docs/_static/img/logo.png b/docs/_static/img/logo.png
index 65df612..30cbcff 100644
Binary files a/docs/_static/img/logo.png and b/docs/_static/img/logo.png differ
diff --git a/docs/_templates/sidebar-top.html b/docs/_templates/sidebar-top.html
index cc1cff2..db5c1e1 100644
--- a/docs/_templates/sidebar-top.html
+++ b/docs/_templates/sidebar-top.html
@@ -1,17 +1,12 @@
-<!-- Based on TextBlob's template: http://goo.gl/XqFeTq -->
-
-<!-- Dirty hack since RTD doesn't respect 'templates_path' in conf.py-->
 <link href='http://fonts.googleapis.com/css?family=Amethysta:400' rel='stylesheet'>
-
-<!-- Place this tag in your head or just before your close body tag. -->
 <script async defer src="https://buttons.github.io/buttons.js"></script>
 
-<h1 class="logo-text">Falcon</h1>
-<p id="teh-logo" class="logo">
-    <a href="{{ pathto(master_doc) }}"><img class="logo" src="{{ pathto('_static/img/logo.png', 1) }}" width="170" height="214" alt="Logo"/></a>
-</p>
+<div id="logo">
+    <div id="logo-text"><a href="{{ pathto(master_doc) }}">Falcon</a></div>
+    <a href="{{ pathto(master_doc) }}"><img src="{{ pathto('_static/img/logo.png', 1) }}" width="163" height="211" alt="Falcon Web Framework Logo"/></a>
+</div>
 
-<p id="gh-buttons">
+<div id="gh-buttons">
     <a class="github-button" href="https://github.com/falconry/falcon" data-icon="octicon-star" aria-label="Star falconry/falcon on GitHub" data-style="mega">Star</a>
     <a class="github-button" href="https://github.com/falconry/falcon/issues" data-icon="octicon-issue-opened" aria-label="Issue falconry/falcon on GitHub" data-style="mega">Issue</a>
-</p>
+</div>