diff --git a/doc/_static/custom.css b/doc/_static/custom.css
index b15770ab38..f95b07c2a3 100644
--- a/doc/_static/custom.css
+++ b/doc/_static/custom.css
@@ -3,6 +3,16 @@
 a, a:hover, a:focus, a:visited, .alert a, .alert .alert-link {color: #1f74ad;}
 .wy-menu a:visited, .wy-menu-vertical a:visited, .wy-menu a:hover, .wy-menu-vertical a:hover { color: #d9d9d9; }
 
+.wy-nav-top>a img.logo {
+  display:block;
+  margin:0 auto;
+  height:auto;
+  width:auto;
+  border-radius:0;
+  max-width:100%;
+  background:transparent
+}
+
 pre {
     background: #ecf0f1;
 }
diff --git a/doc/conf.py b/doc/conf.py
index b35fea0e89..eead349e93 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -10,7 +10,6 @@
 #
 # All configuration values have a default; values that are commented out
 # serve to show the default.
-import sphinx_rtd_theme
 import sys, os
 
 # If extensions (or modules to document with autodoc) are in another directory,
@@ -39,7 +38,7 @@
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ['templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -108,12 +107,7 @@
 # Sphinx are currently 'default' and 'sphinxdoc'.
 html_theme = 'sphinx_rtd_theme'
 
-# Add any paths that contain custom themes here, relative to this directory.
-html_theme_path = [
-    os.path.join(os.path.abspath(os.path.dirname(__file__)), "templates")
-]
-
-html_logo = "templates/bootstrap/static/nav-logo.svg"
+html_logo = "templates/static/nav-logo.svg"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
diff --git a/doc/templates/layout.html b/doc/templates/layout.html
new file mode 100644
index 0000000000..3ac975f40b
--- /dev/null
+++ b/doc/templates/layout.html
@@ -0,0 +1,11 @@
+{% extends "!layout.html" %}
+{% block mobile_nav %}
+  {%- set _logo_url = logo_url|default(pathto('_static/' + (logo or ""), 1)) %}
+  {%- set _root_doc = root_doc|default(master_doc) %}
+  <a href="{{ pathto(_root_doc) }}"{% if not theme_logo_only %} class="icon icon-home"{% endif %}>
+    {% if not theme_logo_only %}{{ project }}{% endif %}
+    {%- if logo or logo_url %}
+      <img src="{{ _logo_url }}" class="logo" alt="{{ _('Logo') }}"/>
+    {%- endif %}
+  </a>
+{% endblock %}
\ No newline at end of file
diff --git a/doc/templates/bootstrap/static/nav-logo.svg b/doc/templates/static/nav-logo.svg
similarity index 100%
rename from doc/templates/bootstrap/static/nav-logo.svg
rename to doc/templates/static/nav-logo.svg