diff --git a/v2/lib/load/config.js b/v2/lib/load/config.js
index d6ca704f1654..161e65b546b9 100644
--- a/v2/lib/load/config.js
+++ b/v2/lib/load/config.js
@@ -30,6 +30,7 @@ const OPTIONAL_FIELDS = [
   'customDocsPath',
   'customFields',
   'defaultLanguage',
+  'disableHeaderTitle',
   'docsUrl',
   'githubHost',
   'highlight',
diff --git a/v2/lib/theme/Navbar/index.js b/v2/lib/theme/Navbar/index.js
index ea2a8fdf093f..1447749dd279 100644
--- a/v2/lib/theme/Navbar/index.js
+++ b/v2/lib/theme/Navbar/index.js
@@ -20,11 +20,19 @@ function Navbar(props) {
     metadata = {},
     docsMetadatas = {},
   } = context;
-  const {baseUrl, headerLinks, headerIcon, algolia} = siteConfig;
+  const {
+    baseUrl,
+    headerLinks,
+    headerIcon,
+    algolia,
+    title,
+    disableHeaderTitle,
+  } = siteConfig;
   const {language: thisLanguage, version: thisVersion} = metadata;
 
   const translationEnabled = env.translation.enabled;
   const versioningEnabled = env.versioning.enabled;
+  const defaultVersion = versioningEnabled && env.versioning.defaultVersion;
 
   // function to generate each header link
   const makeLinks = link => {
@@ -111,15 +119,31 @@ function Navbar(props) {
       <div className={styles.navbarInner}>
         <ul className={styles.navList}>
           <li key="logo" className={styles.navListItem}>
-            <Link className={styles.navBrand} to="/">
-              <img
-                alt="Docusaurus Logo"
-                className={styles.navLogo}
-                src={baseUrl + headerIcon}
-              />
-              <strong>Docusaurus</strong>
+            <Link
+              className={styles.navBrand}
+              to={baseUrl + (translationEnabled ? thisLanguage : '')}>
+              {headerIcon && (
+                <img
+                  className={styles.navLogo}
+                  src={baseUrl + headerIcon}
+                  alt={title}
+                />
+              )}
+              {!disableHeaderTitle && <strong>{title}</strong>}
             </Link>
           </li>
+          {versioningEnabled && (
+            <li key="versions" className={styles.navListItem}>
+              <Link
+                className={styles.navVersion}
+                to={
+                  baseUrl +
+                  (translationEnabled ? `${thisLanguage}/versions` : `versions`)
+                }>
+                {thisVersion || defaultVersion}
+              </Link>
+            </li>
+          )}
           {headerLinks.map(makeLinks)}
         </ul>
       </div>
diff --git a/v2/lib/theme/Navbar/styles.module.css b/v2/lib/theme/Navbar/styles.module.css
index 2b98a2df86a7..5feadce3e822 100644
--- a/v2/lib/theme/Navbar/styles.module.css
+++ b/v2/lib/theme/Navbar/styles.module.css
@@ -29,6 +29,13 @@
   text-decoration: none;
 }
 
+.navVersion {
+  color: black;
+  text-decoration: underline;
+  display: block;
+  padding: 1em 1.2em;
+}
+
 .navLogo {
   height: 40px;
   margin-right: 12px;