diff --git a/akka-docs/_sphinx/themes/akka/layout.html b/akka-docs/_sphinx/themes/akka/layout.html
index 22e0dd9c44b..c0a5548a59d 100644
--- a/akka-docs/_sphinx/themes/akka/layout.html
+++ b/akka-docs/_sphinx/themes/akka/layout.html
@@ -98,7 +98,7 @@
   {%- endblock %}
   <div class="main">
     <div class="container">
-      <div class="page-title">{{ title }}</div>
+      <div class="page-title">{{ title }} - Version {{ release|e }}</div>
       <div class="pdf-link"><a href="{{ pathto('AkkaScala.pdf', 1) }}" title="Akka Scala Documentation"><img src="{{ pathto('_static/pdf-scala-icon.png', 1) }}" style="height: 40px;" /></a></div>
       <div class="pdf-link"><a href="{{ pathto('AkkaJava.pdf', 1) }}" title="Akka Java Documentation"><img src="{{ pathto('_static/pdf-java-icon.png', 1) }}" style="height: 40px;" /></a></div>
     </div>
@@ -106,27 +106,26 @@
       <div class="container">
         <div class="row">
           <div class="span12">
-            <ul class="breadcrumb">
-              <li>
-                {%- if next %}
-                 <span class="divider">|</span> <a href="{{ next.link|e }}">{{ next.title }}</a> <span class="divider">»</span>
-                {%- endif %}
-              </li>
-              <li>
-                <a href="{{ pathto('java.html', 1) }}">Java Contents</a> <span class="divider">|</span> <a href="{{ pathto('scala.html', 1) }}">Scala Contents</a>
-              </li>
-              <li>
-                {%- if prev %}
-                <span class="divider">«</span> <a href="{{ prev.link|e }}">{{ prev.title }}</a> <span class="divider">|</span>
-                {%- endif %}
-              </li>
-              <li style="float: left">
-                Version {{ release|e }}
-              </li>
-              <li style="float: left">
-                <input type="search" id="search" class="form-control" />
-              </li>
-            </ul>
+            <div class="breadcrumb">
+              <div style="position: relative">
+                <input type="search" id="search" class="form-control" style="position: relative" placeholder="Search in the doc" />
+              </div>
+              <div>
+                <div>
+                  {%- if prev %}
+                  <span class="divider">«</span> <a href="{{ prev.link|e }}">{{ prev.title }}</a> <span class="divider">|</span>
+                  {%- endif %}
+                </div>
+                <div>
+                  <a href="{{ pathto('java.html', 1) }}">Java Contents</a> <span class="divider">|</span> <a href="{{ pathto('scala.html', 1) }}">Scala Contents</a>
+                </div>
+                <div>
+                  {%- if next %}
+                  <span class="divider">|</span> <a href="{{ next.link|e }}">{{ next.title }}</a> <span class="divider">»</span>
+                  {%- endif %}
+                </div>
+              </div>
+            </div>
           </div>
         </div>
         <div class="row">
diff --git a/akka-docs/_sphinx/themes/akka/static/docs.css b/akka-docs/_sphinx/themes/akka/static/docs.css
index 93d31c4a852..bf28ea4fee6 100644
--- a/akka-docs/_sphinx/themes/akka/static/docs.css
+++ b/akka-docs/_sphinx/themes/akka/static/docs.css
@@ -7,11 +7,11 @@ a:hover { color: #15A9CE; text-decoration: underline; }
 .page-title { position: relative; top: 24px; font-family: 'Source Sans Pro', sans-serif; font-size: 24px; font-weight: 400; color: rgba(255, 255, 255, 1); width: 840px;}
 .main-container { background: #ffffff;  min-height: 600px; padding-top: 20px; margin-top: 28px; }
 .pdf-link { float: right; height: 40px; margin-bottom: -15px; margin-top: -5px; }
-.breadcrumb { height: 18px; }
-.breadcrumb li { float: right; }
-.breadcrumb li a { color: #447281; }
-.breadcrumb li a:hover { color: #15A9CE; text-decoration: none; }
-.breadcrumb li:last-child { float: left; font-weight: bold; }
+.breadcrumb { height: 18px; display: flex; justify-content: space-between; }
+.breadcrumb div { display: flex; }
+.breadcrumb div a { color: #447281; }
+.breadcrumb div a:hover { color: #15A9CE; text-decoration: none; }
+.breadcrumb input { top: -5px; }
 .contents-title { font-weight: bold; font-size: 18px; line-height: 27px; margin-bottom: 6px; color: #0d2428; text-shadow:0 1px 0 #f0fafc; }
 div#toc { margin-left: -16px; }
 div#toc ul { list-style: none; margin: 0 0 5px 16px; }
@@ -226,13 +226,6 @@ p.caption { width: 80%; text-align: justify; font-size: 0.95em; font-style: ital
   text-decoration: none;
 }
 
-.algolia-autocomplete {
-  display: block;
-  width: 100%;
-  height: 100%;
-  top: -5px;
-  left: 10px;
-}
 .algolia-docsearch-footer {
   width: 100px;
   height: 20px;
diff --git a/akka-docs/_sphinx/themes/akka/static/style.css b/akka-docs/_sphinx/themes/akka/static/style.css
index c3205e60287..28e535d3600 100644
--- a/akka-docs/_sphinx/themes/akka/static/style.css
+++ b/akka-docs/_sphinx/themes/akka/static/style.css
@@ -520,7 +520,7 @@ button.btn.small,input[type="submit"].btn.small{*padding-top:3px;*padding-bottom
 .navbar .nav .active>.dropdown-toggle:hover{color:#ffffff;}
 .navbar .nav.pull-right .dropdown-menu{left:auto;right:0;}.navbar .nav.pull-right .dropdown-menu:before{left:auto;right:12px;}
 .navbar .nav.pull-right .dropdown-menu:after{left:auto;right:13px;}
-.breadcrumb{padding:7px 14px;margin:0 0 18px;background-color:rgba(251, 251, 251, 0.7);background-image:-moz-linear-gradient(top, rgba(255, 255, 255, 0.7), rgba(245, 245, 245, 0.7));background-image:-ms-linear-gradient(top, rgba(255, 255, 255, 0.7), rgba(245, 245, 245, 0.7));background-image:-webkit-gradient(linear, 0 0, 0 100%, from(rgba(255, 255, 255, 0.7)), to(rgba(245, 245, 245, 0.7)));background-image:-webkit-linear-gradient(top, rgba(255, 255, 255, 0.7), rgba(245, 245, 245, 0.7));background-image:-o-linear-gradient(top, rgba(255, 255, 255, 0.7), rgba(245, 245, 245, 0.7));background-image:linear-gradient(top, rgba(255, 255, 255, 0.7), rgba(245, 245, 245, 0.7));background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='rgba(255, 255, 255, 0.7)', endColorstr='rgba(245, 245, 245, 0.7)', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;}
+.breadcrumb{padding:7px;margin:0 0 18px;background-color:rgba(251, 251, 251, 0.7);background-image:-moz-linear-gradient(top, rgba(255, 255, 255, 0.7), rgba(245, 245, 245, 0.7));background-image:-ms-linear-gradient(top, rgba(255, 255, 255, 0.7), rgba(245, 245, 245, 0.7));background-image:-webkit-gradient(linear, 0 0, 0 100%, from(rgba(255, 255, 255, 0.7)), to(rgba(245, 245, 245, 0.7)));background-image:-webkit-linear-gradient(top, rgba(255, 255, 255, 0.7), rgba(245, 245, 245, 0.7));background-image:-o-linear-gradient(top, rgba(255, 255, 255, 0.7), rgba(245, 245, 245, 0.7));background-image:linear-gradient(top, rgba(255, 255, 255, 0.7), rgba(245, 245, 245, 0.7));background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='rgba(255, 255, 255, 0.7)', endColorstr='rgba(245, 245, 245, 0.7)', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}
 .breadcrumb .divider{padding:0 5px;color:#999999;}
 .breadcrumb .active a{color:#333333;}
 .pagination{height:36px;margin:18px 0;}