diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29096fcad..5f227f561 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.6.0] - 29.09.2020
+### Added
+- focus-visible styles
+### Fixed
+- spacing between dashboard items sections in 2 column layout without overriding templates
+- typo in login page styles
+
 ## [1.5.1] - 15.06.2020
 ### Added
 - Node 12.x support
diff --git a/components/01-globals/_focus/_focus.scss b/components/01-globals/_focus/_focus.scss
index db5426d94..751935e9c 100644
--- a/components/01-globals/_focus/_focus.scss
+++ b/components/01-globals/_focus/_focus.scss
@@ -1,3 +1,7 @@
-*:focus {
+.js-focus-visible :focus:not(.focus-visible) {
+    outline: $outline-base;
+}
+
+.js-focus-visible .focus-visible {
     @include focus();
 }
diff --git a/components/01-globals/mixins/_visually-hidden.scss b/components/01-globals/mixins/_visually-hidden.scss
index db09119a9..31739e1b7 100644
--- a/components/01-globals/mixins/_visually-hidden.scss
+++ b/components/01-globals/mixins/_visually-hidden.scss
@@ -8,7 +8,7 @@
     overflow: hidden;
     border: 0;
     @if $usePseudo != '' {
-        &:focus,
+        &.focus-visible,
         &:active {
             clip:     auto;
             height:   auto;
diff --git a/components/01-globals/typography/link/_link.scss b/components/01-globals/typography/link/_link.scss
index c6e5c3c80..914703f59 100644
--- a/components/01-globals/typography/link/_link.scss
+++ b/components/01-globals/typography/link/_link.scss
@@ -22,7 +22,7 @@ $link__color-hover--invert: $blue !default;
         color: $link__color-hover;
     }
 
-    &:focus {
+    &.focus-visible {
         @include focus();
     }
 
@@ -50,7 +50,7 @@ $link__color-hover--invert: $blue !default;
     p &,
     cite & {
         background-clip: content-box;
-        &:focus:not(.banner) {
+        &.focus-visible:not(.banner) {
             @include focus-inline();
         }
     }
diff --git a/components/02-elements/action/_action.scss b/components/02-elements/action/_action.scss
index ab248d4fb..4d9b3404c 100644
--- a/components/02-elements/action/_action.scss
+++ b/components/02-elements/action/_action.scss
@@ -41,7 +41,7 @@ $action-padding: 15px !default;
         margin-right: 15px;
         background-clip: content-box;
 
-        &:focus {
+        &.focus-visible {
             @include focus-inline();
         }
 
diff --git a/components/02-elements/breadcrumbs/_breadcrumbs.scss b/components/02-elements/breadcrumbs/_breadcrumbs.scss
index bea06259d..3a44bd042 100644
--- a/components/02-elements/breadcrumbs/_breadcrumbs.scss
+++ b/components/02-elements/breadcrumbs/_breadcrumbs.scss
@@ -68,7 +68,7 @@ $breadcrumbs__min-height             : 50px !default;
         text-decoration: none;
         background-clip: content-box;
 
-        &:focus {
+        &.focus-visible {
             @include focus-inline();
         }
     }
diff --git a/components/02-elements/cookie-message/_cookie-message.scss b/components/02-elements/cookie-message/_cookie-message.scss
index d0aec3b26..acc418722 100644
--- a/components/02-elements/cookie-message/_cookie-message.scss
+++ b/components/02-elements/cookie-message/_cookie-message.scss
@@ -56,7 +56,7 @@ $cookie-message__close-icon-margin-left : $spacer !default;
     &__link {
         color: $cookie-message__link-color;
         background-clip: content-box;
-        &:focus {
+        &.focus-visible {
             @include focus-inline();
         }
     }
diff --git a/components/02-elements/dropdown-list/_dropdown-list.scss b/components/02-elements/dropdown-list/_dropdown-list.scss
index a51cc8cc7..e00d3126f 100644
--- a/components/02-elements/dropdown-list/_dropdown-list.scss
+++ b/components/02-elements/dropdown-list/_dropdown-list.scss
@@ -93,7 +93,7 @@ $dropdown-list__content-margin--screen-m  : $spacer $spacer--medium !default;
             }
 
             &:hover,
-            &:focus {
+            &.focus-visible {
                 background-color: $dropdown-list__bg-color--secondary;
                 color: $dropdown-list__item-color--secondary;
                 & > .dropdown-list__icon {
@@ -124,7 +124,7 @@ $dropdown-list__content-margin--screen-m  : $spacer $spacer--medium !default;
             font-weight: $font-weight-bold;
 
             &:hover,
-            &:focus {
+            &.focus-visible {
                 color: $dropdown-list__item-color-hover--dark;
                 background-color: $dropdown-list__item-bg-color-hover--dark;
 
@@ -152,7 +152,7 @@ $dropdown-list__content-margin--screen-m  : $spacer $spacer--medium !default;
             background-color: $dropdown-list__item-bg-color--inner;
             font-weight: $dropdown-list__item-font-weight--inner;
             &:hover,
-            &:focus {
+            &.focus-visible {
                 color: $dropdown-list__item-color-hover--inner;
             }
             &[aria-expanded="true"] {
@@ -223,7 +223,7 @@ $dropdown-list__content-margin--screen-m  : $spacer $spacer--medium !default;
         font-weight: $dropdown-list__item-font-weight;
 
         &:hover,
-        &:focus {
+        &.focus-visible {
             color: $dropdown-list__item-color-hover;
             background-color: $dropdown-list__item-bg-color-hover;
             text-decoration: underline;
@@ -276,7 +276,7 @@ $dropdown-list__content-margin--screen-m  : $spacer $spacer--medium !default;
             .dropdown-list__label {
                 cursor: default;
                 &:hover,
-                &:focus {
+                &.focus-visible {
                     color: $dropdown-list__item-color;
                     background-color: $dropdown-list__item-bg-color;
                     text-decoration: none;
@@ -293,7 +293,7 @@ $dropdown-list__content-margin--screen-m  : $spacer $spacer--medium !default;
             &.dropdown-list--dark {
                 .dropdown-list__label {
                     &:hover,
-                    &:focus {
+                    &.focus-visible {
                         color: $dropdown-list__item-color--dark;
                         background-color: $dropdown-list__item-bg-color-hover--dark;
                     }
diff --git a/components/02-elements/form/checkbox/_checkbox.scss b/components/02-elements/form/checkbox/_checkbox.scss
index e11a2d9f8..9e4c37e07 100644
--- a/components/02-elements/form/checkbox/_checkbox.scss
+++ b/components/02-elements/form/checkbox/_checkbox.scss
@@ -21,7 +21,7 @@ $checkbox__color--fake          : $gray-dark !default;
         color: $checkbox__color--fake;
 
         &:hover,
-        &:focus {
+        &.focus-visible {
             text-decoration: underline;
         }
     }
@@ -52,7 +52,7 @@ $checkbox__color--fake          : $gray-dark !default;
             border: $checkbox__border--checked;
         }
 
-        &:focus ~ .checkbox__label {
+        &.focus-visible ~ .checkbox__label {
             @include focus();
         }
     }
diff --git a/components/02-elements/form/input/_input.scss b/components/02-elements/form/input/_input.scss
index e00af27df..0b95f866e 100644
--- a/components/02-elements/form/input/_input.scss
+++ b/components/02-elements/form/input/_input.scss
@@ -43,7 +43,7 @@ $input__date-margin                  : 0 0 0 $spacer !default;
             color: $input__placeholder-color;
         }
 
-        &:focus {
+        &.focus-visible {
             @include focus-input();
         }
 
@@ -68,7 +68,7 @@ $input__date-margin                  : 0 0 0 $spacer !default;
         margin: $input__date-margin;
 
         &:hover,
-        &:focus {
+        &.focus-visible {
             background-image: $input__date-background-image;
             background-size: $input__date-background-size;
             background-repeat: $input__date-background-repeat;
diff --git a/components/02-elements/form/radio/_radio.scss b/components/02-elements/form/radio/_radio.scss
index 3841e472c..0c00dcc69 100644
--- a/components/02-elements/form/radio/_radio.scss
+++ b/components/02-elements/form/radio/_radio.scss
@@ -43,7 +43,7 @@ $radio__icon-transition   : $transition-base !default;
             }
         }
 
-        &:focus + .radio__label {
+        &.focus-visible + .radio__label {
             @include focus();
         }
     }
diff --git a/components/02-elements/form/select/_select.scss b/components/02-elements/form/select/_select.scss
index a78946358..22514d5ba 100644
--- a/components/02-elements/form/select/_select.scss
+++ b/components/02-elements/form/select/_select.scss
@@ -23,7 +23,7 @@ $select__field-list-border-radius--single: 20px !default;
             appearance: none;
             transition: $transition-base;
 
-            &:focus {
+            &.focus-visible {
                 @include focus-input();
             }
         }
@@ -51,7 +51,7 @@ $select__field-list-border-radius--single: 20px !default;
     &__field-input {
         transition: $transition-base;
 
-        &:focus {
+        &.focus-visible {
             outline: none;
         }
     }
diff --git a/components/02-elements/marketing-bar/_marketing-bar.scss b/components/02-elements/marketing-bar/_marketing-bar.scss
index 8c520d002..194892fd4 100644
--- a/components/02-elements/marketing-bar/_marketing-bar.scss
+++ b/components/02-elements/marketing-bar/_marketing-bar.scss
@@ -52,7 +52,7 @@ $marketing-bar__button-icon-padding : 2px !default;
         border: none;
         background-color: transparent;
 
-        &:focus,
+        &.focus-visible,
         &:hover {
             background-color: transparent;
         }
diff --git a/components/02-elements/rating/_rating.scss b/components/02-elements/rating/_rating.scss
index 636f91778..949edb504 100644
--- a/components/02-elements/rating/_rating.scss
+++ b/components/02-elements/rating/_rating.scss
@@ -13,7 +13,7 @@ $rating__error-color            : $red !default;
     width: $rating__size;
 
     &:hover,
-    &:focus {
+    &.focus-visible {
         .rating__rate-item span:before {
             display: block;
         }
@@ -25,7 +25,7 @@ $rating__error-color            : $red !default;
         overflow: hidden;
 
         &:hover,
-        &:focus {
+        &.focus-visible {
             ~ .rating__rate-item span:before {
                 display: none;
             }
@@ -96,7 +96,7 @@ $rating__error-color            : $red !default;
                 display: none;
             }
             .rating__star--rate:hover &,
-            .rating__star--rate:focus &,
+            .rating__star--rate.focus-visible &,
             .rating__rate-item--active & {
                 display: block;
             }
@@ -179,7 +179,7 @@ $rating__error-color            : $red !default;
             width: 1px;
             height: 1px;
             bottom: 0;
-            &:focus {
+            &.focus-visible {
                 opacity: 1;
                 height: 0;
                 outline: none;
diff --git a/components/02-elements/skip-nav/_skip-nav.scss b/components/02-elements/skip-nav/_skip-nav.scss
index c53e6fe1c..e07a384d8 100644
--- a/components/02-elements/skip-nav/_skip-nav.scss
+++ b/components/02-elements/skip-nav/_skip-nav.scss
@@ -4,7 +4,7 @@
     top: 0;
     left: 0;
 
-    &:focus,
+    &.focus-visible,
     &:hover {
         position: absolute;
         margin: $spacer;
@@ -13,7 +13,7 @@
     }
 
     &--relative {
-        &:focus,
+        &.focus-visible,
         &:hover {
             display: block;
             position: relative;
diff --git a/components/02-elements/swatch/_swatch.scss b/components/02-elements/swatch/_swatch.scss
index c19d79cbd..9047960e2 100644
--- a/components/02-elements/swatch/_swatch.scss
+++ b/components/02-elements/swatch/_swatch.scss
@@ -30,7 +30,7 @@ $swatch__option-border-color--active : $color-primary !default;
         cursor: pointer;
 
         &:hover,
-        &:focus,
+        &.focus-visible,
         &.selected {
             outline: none;
             border-color: $swatch__option-border-color--active;
diff --git a/components/03-modules/active-filters/_active-filters.scss b/components/03-modules/active-filters/_active-filters.scss
index 5c4ce0708..6124a491f 100644
--- a/components/03-modules/active-filters/_active-filters.scss
+++ b/components/03-modules/active-filters/_active-filters.scss
@@ -39,7 +39,7 @@ $active-filters__clear-color\@medium : $color-secondary !default;
         word-break: break-all;
 
         &:hover,
-        &:focus {
+        &.focus-visible {
             outline-offset: -7px;
             .active-filters__remove-icon {
                 fill: $active-filters__icon-fill--hover;
@@ -84,7 +84,7 @@ $active-filters__clear-color\@medium : $color-secondary !default;
         text-decoration: none;
 
         &:hover,
-        &:focus {
+        &.focus-visible {
             text-decoration: none;
             color: $active-filters__clear-color;
         }
@@ -98,7 +98,7 @@ $active-filters__clear-color\@medium : $color-secondary !default;
             text-decoration: none;
 
             &:hover,
-            &:focus {
+            &.focus-visible {
                 color: $active-filters__clear-color\@medium;
                 text-decoration: underline;
             }
diff --git a/components/03-modules/bundle-option/_bundle-option.scss b/components/03-modules/bundle-option/_bundle-option.scss
index 9acf8f787..83a79c475 100644
--- a/components/03-modules/bundle-option/_bundle-option.scss
+++ b/components/03-modules/bundle-option/_bundle-option.scss
@@ -51,7 +51,7 @@ $bundle-option__qty-input-cursor--disabled : default !default;
             color: $bundle-option__qty-input-color--disabled;
 
             &:hover,
-            &:focus {
+            &.focus-visible {
                 cursor: $bundle-option__qty-input-cursor--disabled;
             }
         }
diff --git a/components/03-modules/cart-list-item/_cart-list-item.scss b/components/03-modules/cart-list-item/_cart-list-item.scss
index dbe64845d..2717dc6d8 100644
--- a/components/03-modules/cart-list-item/_cart-list-item.scss
+++ b/components/03-modules/cart-list-item/_cart-list-item.scss
@@ -63,7 +63,7 @@ $cart-list-item__actions-item-margin       : 0 0 0 $spacer !default;
         }
 
         &:hover,
-        &:focus {
+        &.focus-visible {
             text-decoration: none;
         }
     }
diff --git a/components/03-modules/catalog-grid-item/_catalog-grid-item.scss b/components/03-modules/catalog-grid-item/_catalog-grid-item.scss
index e0c6ea528..9d636b2a9 100644
--- a/components/03-modules/catalog-grid-item/_catalog-grid-item.scss
+++ b/components/03-modules/catalog-grid-item/_catalog-grid-item.scss
@@ -90,7 +90,7 @@ $catalog-grid-item__IE-width\@medium              : calc(100% / 3 - #{$spacer--m
         flex-direction: row;
 
         &:hover,
-        &:focus-within {
+        &.focus-within {
             .catalog-grid-item__details {
                 transform: $catalog-grid-item__content-translateY--active;
             }
@@ -133,7 +133,7 @@ $catalog-grid-item__IE-width\@medium              : calc(100% / 3 - #{$spacer--m
         align-self: stretch;
         width: $catalog-grid-item__link-width;
 
-        &:focus {
+        &.focus-visible {
             z-index: $catalog-grid-item__link-z-index--focus;
             outline: $catalog-grid-item__link-outline--focus;
         }
@@ -260,7 +260,7 @@ $catalog-grid-item__IE-width\@medium              : calc(100% / 3 - #{$spacer--m
         padding: $catalog-grid-item__primary-padding;
 
         &:hover,
-        &:focus {
+        &.focus-visible {
             .icon {
                 fill: $catalog-grid-item__primary-icon-fill;
             }
@@ -292,7 +292,7 @@ $catalog-grid-item__IE-width\@medium              : calc(100% / 3 - #{$spacer--m
             border: $catalog-grid-item__action-border;
             cursor: $catalog-grid-item__action-cursor;
             &:hover,
-            &:focus {
+            &.focus-visible {
                 .button__icon {
                     fill: $catalog-grid-item__action-icon-fill-hover;
                 }
diff --git a/components/03-modules/catalog-list-item/_catalog-list-item.scss b/components/03-modules/catalog-list-item/_catalog-list-item.scss
index 7ef3f3a40..682cfc041 100644
--- a/components/03-modules/catalog-list-item/_catalog-list-item.scss
+++ b/components/03-modules/catalog-list-item/_catalog-list-item.scss
@@ -103,7 +103,7 @@ $catalog-list-item__stock-status-color--out-of-stock             : $color-danger
 
     &__link {
         display: block;
-        &:focus {
+        &.focus-visible {
             outline: $outline-base;
             z-index: 0;
             .image {
@@ -212,7 +212,7 @@ $catalog-list-item__stock-status-color--out-of-stock             : $color-danger
             }
 
             &:hover,
-            &:focus {
+            &.focus-visible {
                 background-color: transparent;
 
                 .button__icon {
diff --git a/components/03-modules/dashboard/items/_items.scss b/components/03-modules/dashboard/items/_items.scss
index fa37daad2..79d68245d 100644
--- a/components/03-modules/dashboard/items/_items.scss
+++ b/components/03-modules/dashboard/items/_items.scss
@@ -1,5 +1,7 @@
-$dashboard-items-padding: 15px !default;
-$dashboard-items-margin : 15px !default;
+$dashboard-items-padding         : 15px !default;
+$dashboard-items-margin          : 15px !default;
+$dashboard-items__item-max-width : calc(50% - #{$spacer--medium}) !default;
+$dashboard-items__item-margin    : 15px $spacer--medium 15px 0 !default;
 
 .dashboard-items {
     &__title {
@@ -17,7 +19,8 @@ $dashboard-items-margin : 15px !default;
     }
 
     &__item {
+        max-width: $dashboard-items__item-max-width;
+        margin: $dashboard-items__item-margin;
         padding: $dashboard-items-padding 0;
-        margin-bottom: $dashboard-items-margin;
     }
 }
diff --git a/components/03-modules/dashboard/table/_table.scss b/components/03-modules/dashboard/table/_table.scss
index 5bf3d3abc..a38cf4cd4 100644
--- a/components/03-modules/dashboard/table/_table.scss
+++ b/components/03-modules/dashboard/table/_table.scss
@@ -33,7 +33,7 @@ $dashboard-table-margin: $spacer--medium !default;
 
     &__link {
         display: inline-flex;
-        &:focus {
+        &.focus-visible {
             @include focus-inline();
         }
     }
diff --git a/components/03-modules/filter/_filter.scss b/components/03-modules/filter/_filter.scss
index d9214c91c..c75297405 100644
--- a/components/03-modules/filter/_filter.scss
+++ b/components/03-modules/filter/_filter.scss
@@ -97,7 +97,7 @@ $filter__range-margin                             : 0 0 $spacer--medium 0 !defau
         color: $filter__category-link-color;
 
         &:hover,
-        &:focus {
+        &.focus-visible {
             text-decoration: $filter__category-link-text-decoration;
         }
     }
@@ -132,7 +132,7 @@ $filter__range-margin                             : 0 0 $spacer--medium 0 !defau
         text-decoration: none;
 
         &:hover,
-        &:focus {
+        &.focus-visible {
             text-decoration: none;
             border-color: $filter__swatch-option-border-color-hover;
         }
@@ -179,7 +179,7 @@ $filter__range-margin                             : 0 0 $spacer--medium 0 !defau
 
         &--active,
         &:hover,
-        &:focus {
+        &.focus-visible {
             text-decoration: none;
 
             &:after {
diff --git a/components/03-modules/filters/_filters.scss b/components/03-modules/filters/_filters.scss
index 89eadcb6b..05fffde60 100644
--- a/components/03-modules/filters/_filters.scss
+++ b/components/03-modules/filters/_filters.scss
@@ -42,7 +42,7 @@ $filters__active-margin              : 0 0 $spacer--medium 0 !default;
         @include visually-hidden($usePseudo: true);
         transition: none;
 
-        &:focus {
+        &.focus-visible {
             height: $filters__skip-button-height;
             padding: $filters__skip-button-padding;
             margin-bottom: $filters__skip-button-margin-bottom;
@@ -67,7 +67,7 @@ $filters__active-margin              : 0 0 $spacer--medium 0 !default;
         text-align: left;
 
         &:hover,
-        &:focus {
+        &.focus-visible {
             color: $filters__switcher-color;
             text-decoration: none;
             cursor: pointer;
diff --git a/components/03-modules/footer/_footer.scss b/components/03-modules/footer/_footer.scss
index 0b3cdbba7..38ca5309f 100644
--- a/components/03-modules/footer/_footer.scss
+++ b/components/03-modules/footer/_footer.scss
@@ -94,7 +94,7 @@ $footer__icon-fill-hover               : $color-primary !default;
             color: $footer__link-color-hover;
             text-decoration: $footer__link-text-decoration-hover;
         }
-        &:focus {
+        &.focus-visible {
             @include focus-inline('dark');
         }
     }
@@ -119,7 +119,7 @@ $footer__icon-fill-hover               : $color-primary !default;
         margin: $footer__social-handl-margin;
 
         .list__icon-link {
-            &:focus {
+            &.focus-visible {
                 @include focus('dark');
             }
         }
diff --git a/components/03-modules/gallery/_gallery.scss b/components/03-modules/gallery/_gallery.scss
index 59a4c2234..955765275 100644
--- a/components/03-modules/gallery/_gallery.scss
+++ b/components/03-modules/gallery/_gallery.scss
@@ -79,7 +79,7 @@ $gallery__thumb-width--large               : 80px !default;
             height: $gallery__thumb-height--large;
         }
         &:hover,
-        &:focus {
+        &.focus-visible {
             cursor: pointer;
         }
         &--active {
@@ -94,7 +94,7 @@ $gallery__thumb-width--large               : 80px !default;
         height: $gallery__thumb-arrow-height;
         margin: 0 auto;
         &:hover,
-        &:focus {
+        &.focus-visible {
             cursor: pointer;
         }
     }
diff --git a/components/03-modules/header/_button.scss b/components/03-modules/header/_button.scss
index f1bd226b2..185d002df 100644
--- a/components/03-modules/header/_button.scss
+++ b/components/03-modules/header/_button.scss
@@ -46,7 +46,7 @@ $header-button__counter-dot-bg-color: $white !default;
         margin: $header-button__margin--extra-large;
     }
 
-    &:focus,
+    &.focus-visible,
     &:hover {
         text-decoration: none;
         .header-button__icon {
diff --git a/components/03-modules/header/_featured-info.scss b/components/03-modules/header/_featured-info.scss
index 6238b4cb7..41c091050 100644
--- a/components/03-modules/header/_featured-info.scss
+++ b/components/03-modules/header/_featured-info.scss
@@ -10,7 +10,7 @@ $featured-info__icon-color        : $color-primary !default;
     margin: $featured-info__margin;
     color: $featured-info__title-color;
     text-decoration: none;
-    &:focus,
+    &.focus-visible,
     &:hover {
         text-decoration: none;
     }
diff --git a/components/03-modules/header/_search-form.scss b/components/03-modules/header/_search-form.scss
index 22b1df281..782ce9874 100644
--- a/components/03-modules/header/_search-form.scss
+++ b/components/03-modules/header/_search-form.scss
@@ -58,7 +58,7 @@ $search-form__placeholder-color : $gray !default;
         border-radius: $search-form__height;
         background-color: $search-form__button-background;
 
-        &:focus,
+        &.focus-visible,
         &:hover {
             background-color: $search-form__button-background;
 
diff --git a/components/03-modules/header/_top-bar.scss b/components/03-modules/header/_top-bar.scss
index ddf3cea12..0ced85393 100644
--- a/components/03-modules/header/_top-bar.scss
+++ b/components/03-modules/header/_top-bar.scss
@@ -33,7 +33,7 @@ $top-bar__link-text-decoration: none !default;
             line-height: $top-bar__divider-height;
             text-decoration: $top-bar__link-text-decoration;
 
-            &:focus,
+            &.focus-visible,
             &:hover {
                 text-decoration: $top-bar__link-text-decoration;
             }
@@ -50,7 +50,7 @@ $top-bar__link-text-decoration: none !default;
             line-height: $top-bar__divider-height;
             text-decoration: $top-bar__link-text-decoration;
 
-            &:focus,
+            &.focus-visible,
             &:hover {
                 text-decoration: $top-bar__link-text-decoration;
             }
diff --git a/components/03-modules/mega-menu/_mega-menu.scss b/components/03-modules/mega-menu/_mega-menu.scss
index 0b8186f7b..095ddce32 100644
--- a/components/03-modules/mega-menu/_mega-menu.scss
+++ b/components/03-modules/mega-menu/_mega-menu.scss
@@ -75,7 +75,7 @@ $mega-menu__inner-link-color--image-focus    : $font-color-base !default;
     &__item {
         &--parent {
             &:hover,
-            &:focus {
+            &.focus-visible {
                 .mega-menu__inner-list--level1 {
                     display: flex;
                 }
@@ -86,7 +86,7 @@ $mega-menu__inner-link-color--image-focus    : $font-color-base !default;
                 display: flex;
             }
 
-            &:focus-within {
+            &.focus-within {
                 .mega-menu__inner-list--level1 {
                     display: flex;
                 }
@@ -118,7 +118,7 @@ $mega-menu__inner-link-color--image-focus    : $font-color-base !default;
 
             .mega-menu__inner-link {
                 display: block;
-                &:focus {
+                &.focus-visible {
                     @include focus();
                     background-color: transparent;
                     color: $mega-menu__inner-link-color--image-focus;
@@ -139,7 +139,7 @@ $mega-menu__inner-link-color--image-focus    : $font-color-base !default;
         font-weight: $mega-menu__font-weight;
         color: $mega-menu__link-color;
         text-decoration: $mega-menu__link-text-decoration;
-        &:focus,
+        &.focus-visible,
         &:hover {
             text-decoration: $mega-menu__link-text-decoration;
             color: $mega-menu__link-color--active;
@@ -160,7 +160,7 @@ $mega-menu__inner-link-color--image-focus    : $font-color-base !default;
             color: $mega-menu__inner-link-color--active;
         }
 
-        &:focus {
+        &.focus-visible {
             @include focus-inline();
         }
     }
diff --git a/components/03-modules/minicart-content/_minicart-content.scss b/components/03-modules/minicart-content/_minicart-content.scss
index e816c37ce..a10270c96 100644
--- a/components/03-modules/minicart-content/_minicart-content.scss
+++ b/components/03-modules/minicart-content/_minicart-content.scss
@@ -79,7 +79,7 @@ $minicart-content__products-list-margin     : $spacer 0 0 0 !default;
         font-weight: $minicart-content__edit-font-weight;
         text-align: center;
         text-decoration: $minicart-content__edit-text-decoration;
-        &:focus,
+        &.focus-visible,
         &:hover {
             text-decoration: $minicart-content__edit-text-decoration;
         }
diff --git a/components/03-modules/minicart-product/_minicart-product.scss b/components/03-modules/minicart-product/_minicart-product.scss
index a73f999f5..60f723cc8 100644
--- a/components/03-modules/minicart-product/_minicart-product.scss
+++ b/components/03-modules/minicart-product/_minicart-product.scss
@@ -100,7 +100,7 @@ $minicart-product__action-icon-color--active      : $color-primary !default;
         &.dropdown-list__label {
             color: $minicart-product__attributes-button-color;
             background-color: $minicart-product__attributes-button-bg-color;
-            &:focus,
+            &.focus-visible,
             &:hover {
                 background-color: $minicart-product__attributes-button-bg-color;
             }
@@ -164,7 +164,7 @@ $minicart-product__action-icon-color--active      : $color-primary !default;
         padding: 12px;
         border: 0;
         background-color: $minicart-product__action-button-bg;
-        &:focus,
+        &.focus-visible,
         &:hover {
             background-color: $minicart-product__action-button-bg;
 
diff --git a/components/03-modules/newsletter/_newsletter.scss b/components/03-modules/newsletter/_newsletter.scss
index 84e56154b..c293238e0 100644
--- a/components/03-modules/newsletter/_newsletter.scss
+++ b/components/03-modules/newsletter/_newsletter.scss
@@ -48,7 +48,7 @@ $newsletter__heading-margin             : 0 20px $newsletter__bottom-gap 0 !defa
             cursor: pointer;
             outline: none;
         }
-        &:focus {
+        &.focus-visible {
             @include focus('dark');
         }
     }
@@ -70,7 +70,7 @@ $newsletter__heading-margin             : 0 20px $newsletter__bottom-gap 0 !defa
         &::placeholder {
             color: $newsletter__input-color--placeholder;
         }
-        &:focus {
+        &.focus-visible {
             @include focus-input('dark');
         }
     }
@@ -86,7 +86,7 @@ $newsletter__heading-margin             : 0 20px $newsletter__bottom-gap 0 !defa
         &:checked ~ .checkbox__label:before {
             background: none;
         }
-        &:focus ~ .checkbox__label {
+        &.focus-visible ~ .checkbox__label {
             @include focus('dark');
         }
     }
@@ -112,7 +112,7 @@ $newsletter__heading-margin             : 0 20px $newsletter__bottom-gap 0 !defa
             &:hover {
                 color: $newsletter__checkbox-label-color;
             }
-            &:focus {
+            &.focus-visible {
                 @include focus-inline('dark');
             }
         }
diff --git a/components/03-modules/popup/_popup.scss b/components/03-modules/popup/_popup.scss
index d102134a5..55ccfc320 100644
--- a/components/03-modules/popup/_popup.scss
+++ b/components/03-modules/popup/_popup.scss
@@ -48,7 +48,7 @@ $popup__margin                   : 0 !default;
         border: $popup__close-button-border;
 
         &:hover,
-        &:focus {
+        &.focus-visible {
             background-color: $popup__close-button-bg;
         }
 
@@ -56,7 +56,7 @@ $popup__margin                   : 0 !default;
             fill: $popup__button-icon-fill;
 
             &:hover,
-            &:focus {
+            &.focus-visible {
                 fill: $popup__button-icon-fill--actiive;
             }
         }
diff --git a/components/03-modules/product-view/product-review/_product-review.scss b/components/03-modules/product-view/product-review/_product-review.scss
index 69721e63c..ae182cf93 100644
--- a/components/03-modules/product-view/product-review/_product-review.scss
+++ b/components/03-modules/product-view/product-review/_product-review.scss
@@ -48,7 +48,7 @@ $product-review__borders: 1px solid $gray-light;
         @include mq($screen-m) {
             flex-basis: auto;
         }
-        &:focus {
+        &.focus-visible {
             @include focus-inline();
         }
     }
diff --git a/components/03-modules/quantity-update/_quantity-update.scss b/components/03-modules/quantity-update/_quantity-update.scss
index bc2c5b5a8..37f12c4af 100644
--- a/components/03-modules/quantity-update/_quantity-update.scss
+++ b/components/03-modules/quantity-update/_quantity-update.scss
@@ -32,7 +32,7 @@ $quantity-updater__error-max-width                   : 120px !default;
         text-align: center;
         appearance: none;
 
-        &:focus {
+        &.focus-visible {
             @include focus-input();
         }
     }
@@ -42,7 +42,7 @@ $quantity-updater__error-max-width                   : 120px !default;
         background: $quantity-update__button-background;
         margin: 0;
 
-        &:focus {
+        &.focus-visible {
             @include focus-input();
         }
 
@@ -60,7 +60,7 @@ $quantity-updater__error-max-width                   : 120px !default;
             pointer-events: none;
 
             &:hover,
-            &:focus {
+            &.focus-visible {
                 background: $quantity-update__button-background-hover--disabled;
 
                 .quantity-update__icon {
diff --git a/components/03-modules/quicksearch/_quicksearch.scss b/components/03-modules/quicksearch/_quicksearch.scss
index 3fbc7930a..a74d1fcfa 100644
--- a/components/03-modules/quicksearch/_quicksearch.scss
+++ b/components/03-modules/quicksearch/_quicksearch.scss
@@ -91,7 +91,7 @@ $quicksearch__more-link-font-weight            : $font-weight-bold !default;
         border: $quicksearch__close-border;
         background-color: $quicksearch__close-background;
         &:hover,
-        &:focus {
+        &.focus-visible {
             border: $quicksearch__close-border;
             background-color: $quicksearch__close-background;
         }
diff --git a/components/03-modules/range/_range.scss b/components/03-modules/range/_range.scss
index 2a954d91f..83e99d657 100644
--- a/components/03-modules/range/_range.scss
+++ b/components/03-modules/range/_range.scss
@@ -81,7 +81,7 @@ $range__button-margin         : 0 0 $spacer--medium 0 !default;
         &:after {
             display: none;
         }
-        &:focus {
+        &.focus-visible {
             outline: none;
 
             .noUi-tooltip {
diff --git a/components/03-modules/review/_review.scss b/components/03-modules/review/_review.scss
index 665db515c..a796dd24d 100644
--- a/components/03-modules/review/_review.scss
+++ b/components/03-modules/review/_review.scss
@@ -117,7 +117,7 @@ $review__summary-max-width\@large: 200px !default;
             margin-right: 0;
         }
 
-        &:focus {
+        &.focus-visible {
             @include focus-inline();
         }
 
@@ -130,7 +130,7 @@ $review__summary-max-width\@large: 200px !default;
         text-decoration: underline;
         text-align: right;
 
-        &:focus {
+        &.focus-visible {
             @include focus-inline();
         }
     }
diff --git a/components/03-modules/side-menu/_side-menu.scss b/components/03-modules/side-menu/_side-menu.scss
index 091189905..b2f8a5492 100644
--- a/components/03-modules/side-menu/_side-menu.scss
+++ b/components/03-modules/side-menu/_side-menu.scss
@@ -73,7 +73,7 @@ $side-menu__overlay-background-color    : rgba(0, 0, 0, 0.6) !default;
         background-color: $side-menu__trigger-background-color;
         cursor: pointer;
 
-        &:focus,
+        &.focus-visible,
         &:hover {
             .side-menu__trigger-icon {
                 fill: $side-menu__trigger-icon-color--hover;
diff --git a/components/03-modules/sidebar-block/_sidebar-block.scss b/components/03-modules/sidebar-block/_sidebar-block.scss
index a5ea86339..7b8ef95b2 100644
--- a/components/03-modules/sidebar-block/_sidebar-block.scss
+++ b/components/03-modules/sidebar-block/_sidebar-block.scss
@@ -85,7 +85,7 @@ $sidebar-block__message-margin             : 0 !default;
         background-color: $sidebar-block__remove-background;
 
         &:hover,
-        &:focus {
+        &.focus-visible {
             background-color: $sidebar-block__remove-background;
 
             .sidebar-block__remove-icon {
diff --git a/components/03-modules/slider/_slider.scss b/components/03-modules/slider/_slider.scss
index 96fdf607a..c9def9f92 100644
--- a/components/03-modules/slider/_slider.scss
+++ b/components/03-modules/slider/_slider.scss
@@ -63,7 +63,7 @@ $slider__dot-inside-background--active: $color-primary !default;
         }
 
         &:hover,
-        &:focus,
+        &.focus-visible,
         &:active {
             background-color: $slider__navigation-icon-background;
 
diff --git a/components/03-modules/toolbar/_toolbar.scss b/components/03-modules/toolbar/_toolbar.scss
index b06ca00fb..b521ee4db 100644
--- a/components/03-modules/toolbar/_toolbar.scss
+++ b/components/03-modules/toolbar/_toolbar.scss
@@ -141,7 +141,7 @@ $toolbar__select-dropdown-border-radius: 0 0 $spacer--medium $spacer--medium !de
         cursor: $toolbar__mode-icon-cursor;
 
         &:hover,
-        &:focus {
+        &.focus-visible {
             .toolbar__mode-icon {
                 fill: $toolbar__icon-color--hover;
             }
diff --git a/components/04-views/cart/_discount.scss b/components/04-views/cart/_discount.scss
index 9714579fe..617ed5c9a 100644
--- a/components/04-views/cart/_discount.scss
+++ b/components/04-views/cart/_discount.scss
@@ -87,7 +87,7 @@ $discount__button-padding           : 0 21px !default;
         border-radius: $discount__button-border-radius;
         padding: $discount__button-padding;
         &:hover,
-        &:focus {
+        &.focus-visible {
             cursor: pointer;
             outline: none;
         }
diff --git a/components/04-views/compare/_compare.scss b/components/04-views/compare/_compare.scss
index 58e65a312..58b0761eb 100644
--- a/components/04-views/compare/_compare.scss
+++ b/components/04-views/compare/_compare.scss
@@ -135,7 +135,7 @@ $compare__wishlist-icon-transition : $transition-base !default;
         cursor: $compare__wishlist-cursor;
 
         &:hover,
-        &:focus {
+        &.focus-visible {
             background: $compare__wishlist-background;
             .compare__wishlist-icon,
             .compare__remove-icon {
diff --git a/components/04-views/login/_login.scss b/components/04-views/login/_login.scss
index fac574cbe..9146ca07c 100644
--- a/components/04-views/login/_login.scss
+++ b/components/04-views/login/_login.scss
@@ -11,7 +11,7 @@ $login__company-column-border-top      : 1px solid $gray-light !default;
 $login__horizontal-padding             : 38px !default;
 $login__button-margin                  : 0 $spacer--medium 0 0 !default;
 $login__button-margin\@large           : 0 $spacer--large 0 0 !default;
-$login__button-margin--crate-account   : 0 !default;
+$login__button-margin--create-account  : 0 !default;
 $login__button-min-width               : 160px !default;
 
 $login__form-margin                    : 0 0 $spacer--medium 0 !default;
@@ -101,8 +101,8 @@ $login__validation-tips-margin         : 0 0 $spacer !default;
             margin: $login__button-margin\@large;
         }
 
-        &--create-accunt {
-            margin: $login__button-margin--crate-account;
+        &--create-account {
+            margin: $login__button-margin--create-account;
         }
     }
 
diff --git a/components/04-views/login/login.config.js b/components/04-views/login/login.config.js
index 1aeb1eeb5..2a6798fb7 100644
--- a/components/04-views/login/login.config.js
+++ b/components/04-views/login/login.config.js
@@ -63,7 +63,7 @@ module.exports = {
       text: 'Sign in'
     },
     createAccountButton: {
-      class: 'button--link login__button login__button--create-accunt',
+      class: 'button--link login__button login__button--create-account',
       tag: 'a',
       text: 'Create an Account'
     },