diff --git a/app/helpers/Environment.php b/app/helpers/Environment.php
index a5986779d..20ac0e1d1 100644
--- a/app/helpers/Environment.php
+++ b/app/helpers/Environment.php
@@ -97,7 +97,7 @@ public static function completeUrl($path)
     // returns the piwik versions that can be chosen via the selector
     public static function getAvailablePiwikVersions()
     {
-        return range(2, LATEST_PIWIK_DOCS_VERSION);
+        return range(3, LATEST_PIWIK_DOCS_VERSION);
     }
 
     public static function getPiwikVersion()
diff --git a/app/public/img/logo.png b/app/public/img/logo.png
index 27205e2af..bf4a543b6 100644
Binary files a/app/public/img/logo.png and b/app/public/img/logo.png differ
diff --git a/app/routes/page.php b/app/routes/page.php
index 1a4dee240..279f7eee1 100644
--- a/app/routes/page.php
+++ b/app/routes/page.php
@@ -33,11 +33,23 @@ function initView($app)
 {
     $app->hook('slim.before.dispatch', function () use ($app) {
         $app->view->setData('urlIfAvailableInNewerVersion', false);
+        $availableVersions = Environment::getAvailablePiwikVersions();
+
         if (!Environment::isLatestPiwikVersion()) {
-            $app->view->setData('urlIfAvailableInNewerVersion', getUrlIfDocumentIsAvailableInPiwikVersion($app, LATEST_PIWIK_DOCS_VERSION));
+            $matomoVersion = Environment::getPiwikVersion();
+            $alternativeUrl = getUrlIfDocumentIsAvailableInPiwikVersion($app, LATEST_PIWIK_DOCS_VERSION);
+
+            if (in_array($matomoVersion, $availableVersions)) {
+                $app->view->setData('urlIfAvailableInNewerVersion', $alternativeUrl);
+            } else {
+                // redirect to newest version
+                //$app->response->redirect($alternativeUrl, 301);
+                // exit;
+                $app->view->setData('urlIfAvailableInNewerVersion', $alternativeUrl);
+            }
         }
 
-        $app->view->setData('availablePiwikVersions', Environment::getAvailablePiwikVersions());
+        $app->view->setData('availablePiwikVersions', $availableVersions);
         $app->view->setData('selectedPiwikVersion', Environment::getPiwikVersion());
         $app->view->setData('latestPiwikDocsVersion', LATEST_PIWIK_DOCS_VERSION);
         $app->view->setData('revision', Git::getCurrentShortRevision());
diff --git a/app/templates/base.twig b/app/templates/base.twig
index 0118c4e3e..8636925f2 100644
--- a/app/templates/base.twig
+++ b/app/templates/base.twig
@@ -29,7 +29,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand hidden-sm" href="{{ '/'|completeUrl }}"><img height="20" width="109" src="/img/logo.png"/></a>
+            <a class="navbar-brand hidden-sm" href="{{ '/'|completeUrl }}"><img height="20" width="124" src="/img/logo.png"/></a>
         </div>
         <div class="collapse navbar-collapse">
             <ul class="nav navbar-nav">
@@ -50,6 +50,7 @@
                     <a href="{{ '/support'|completeUrl }}">Support</a>
                 </li>
             </ul>
+            {% if availablePiwikVersions|length > 1 %}
             <ul class="nav navbar-nav pull-right">
                 <li>
                     <div id="quick-search-typeahead">
@@ -70,6 +71,7 @@
                     </div>
                 </li>
             </ul>
+            {% endif %}
         </div>
     </div>
 </div>