diff --git a/plugins/CoreHome/stylesheets/layout.less b/plugins/CoreHome/stylesheets/layout.less
index c5f7416ca7c9013235aac647e481d777caca447b..1d260fc1ea2ad9319d739cdbc710fe9ab7846b22 100644
--- a/plugins/CoreHome/stylesheets/layout.less
+++ b/plugins/CoreHome/stylesheets/layout.less
@@ -1,12 +1,15 @@
- body, img {
+ body {
      :focus {
-         outline: #444 solid 2px;
-
+         outline: 0;
+         -moz-box-shadow: inset 0 0 0 2px @theme-color-background-highContrast;
+         -webkit-box-shadow: inset 0 0 0 2px @theme-color-background-highContrast;
+         box-shadow: inset 0 0 0 2px @theme-color-background-highContrast;
+         border-radius: 2px;
+         -moz-border-radius:2px;
+         -webkit-border-radius:2px;
          }
  }
- #logo {
-  width: auto;
- }
+
  #header {
   padding: 0 15px;
   background-color: @theme-color-background-base;
@@ -274,7 +277,6 @@
 
             &.sfActive {
               .item {
-                color: @theme-color-menu-contrast-textSelected;
                 background-color: @theme-color-background-base;
                 decoration: none;
               }
diff --git a/plugins/CoreHome/templates/_logo.twig b/plugins/CoreHome/templates/_logo.twig
index 170f51ff3ec055e5a1ad2eea1ccae813b5449389..633985a20d888d1633c8bf3aa17d98c59d77ca7b 100644
--- a/plugins/CoreHome/templates/_logo.twig
+++ b/plugins/CoreHome/templates/_logo.twig
@@ -1,7 +1,7 @@
 <span id="logo">
-    <a href="index.php" title="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik # {{ 'General_OpenSourceWebAnalytics'|translate }}" tabindex="3">
+    <a href="index.php" tabindex="-1" title="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik # {{ 'General_OpenSourceWebAnalytics'|translate }}">
     {% if hasSVGLogo %}
-        <img src='{{ logoSVG }}' alt="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik" class="ie-hide {% if not isCustomLogo %}default-piwik-logo{% endif %}" />
+        <img src='{{ logoSVG }}' tabindex="3"  alt="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik" class="ie-hide {% if not isCustomLogo %}default-piwik-logo{% endif %}" />
         <!--[if lt IE 9]>
     {% endif %}
         <img src='{{ logoHeader }}' alt="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik" />