diff --git a/core/themes/seven/css/components/buttons.theme.css b/core/themes/seven/css/components/buttons.theme.css
index 36a4d6a..7d08675 100644
--- a/core/themes/seven/css/components/buttons.theme.css
+++ b/core/themes/seven/css/components/buttons.theme.css
@@ -32,8 +32,8 @@
           transition: all 0.1s;
   -webkit-font-smoothing: antialiased;  /* 3 */
 }
-.button:focus,
-.button:hover {
+.button:hover,
+.button:focus {
   background-color: #f9f8f6;
   background-image: -webkit-linear-gradient(top, #fcfcfa, #e9e9dd);
   background-image:    -moz-linear-gradient(top, #fcfcfa, #e9e9dd);
@@ -75,8 +75,8 @@
   font-weight: 700;
   -webkit-font-smoothing: antialiased;
 }
-.button--primary:focus,
-.button--primary:hover {
+.button--primary:hover,
+.button--primary:focus {
   background-color: #2369a6;
   background-image: -webkit-linear-gradient(top, #0c97ed, #1f86c7);
   background-image:    -moz-linear-gradient(top, #0c97ed, #1f86c7);
@@ -144,8 +144,8 @@
   color: #0074bd;
   text-decoration: none;
 }
-.link:focus,
-.link:hover {
+.link:hover,
+.link:focus {
   color: #008ee6;
   text-decoration: underline;
 }
@@ -170,8 +170,8 @@
   font-weight: 400;
   text-decoration: underline;
 }
-.button--danger:focus,
 .button--danger:hover,
+.button--danger:focus,
 .button--danger:active {
   color: #ff2a00;
   text-decoration: underline;
diff --git a/core/themes/seven/css/components/dropbutton.component.css b/core/themes/seven/css/components/dropbutton.component.css
index 23d6168..513b145 100644
--- a/core/themes/seven/css/components/dropbutton.component.css
+++ b/core/themes/seven/css/components/dropbutton.component.css
@@ -133,8 +133,8 @@
   -webkit-font-smoothing: antialiased;
   width: auto!important;
 }
-.dropbutton-single .dropbutton-action a:focus,
-.dropbutton-single .dropbutton-action a:hover {
+.dropbutton-single .dropbutton-action a:hover,
+.dropbutton-single .dropbutton-action a:focus {
   background-color: #f9f8f6;
   background-image: -webkit-linear-gradient(top, #fcfcfa, #e9e9dd);
   background-image: -moz-linear-gradient(top, #fcfcfa, #e9e9dd);
@@ -144,7 +144,8 @@
   text-decoration: none;
   outline: none;
 }
-.dropbutton-single .dropbutton-action a:hover {
+.dropbutton-single .dropbutton-action a:hover,
+.dropbutton-single .dropbutton-action a:focus {
   box-shadow: 0 1px 2px hsla(0, 0%, 0%, 0.125);
 }
 .dropbutton-single .dropbutton-action a:active {
diff --git a/core/themes/seven/css/components/tour.theme.css b/core/themes/seven/css/components/tour.theme.css
index 3a9b723..6353df3 100644
--- a/core/themes/seven/css/components/tour.theme.css
+++ b/core/themes/seven/css/components/tour.theme.css
@@ -71,7 +71,8 @@
   font-size: 1.4em;
   font-weight: bold;
 }
-.joyride-close-tip:hover {
+.joyride-close-tip:hover,
+.joyride-close-tip:focus {
   color: rgba(255,255,255, 0.9);
   text-decoration: none;
 }
diff --git a/core/themes/seven/quickedit.css b/core/themes/seven/quickedit.css
index 5172b60..7028c84 100644
--- a/core/themes/seven/quickedit.css
+++ b/core/themes/seven/quickedit.css
@@ -32,10 +32,10 @@
   -webkit-font-smoothing: antialiased;
   margin-top: 2px;
 }
-.quickedit-button.action-save:focus,
 .quickedit-button.action-save:hover,
-.quickedit-button.action-saving:focus
-.quickedit-button.action-saving:hover {
+.quickedit-button.action-save:focus,
+.quickedit-button.action-saving:hover,
+.quickedit-button.action-saving:focus {
   background-color: #2369a6;
   background-image: -webkit-linear-gradient(top, #0c97ed, #1f86c7);
   background-image:    -moz-linear-gradient(top, #0c97ed, #1f86c7);
@@ -45,7 +45,9 @@
   color: #fff;
 }
 .quickedit-button.action-save:hover,
-.quickedit-button.action-saving:hover {
+.quickedit-button.action-save:focus,
+.quickedit-button.action-saving:hover,
+.quickedit-button.action-saving:focus {
   box-shadow: 0 1px 2px hsla(203, 10%, 10%, 0.25);
 }
 .quickedit-button.action-save:active,
diff --git a/core/themes/seven/seven.base.css b/core/themes/seven/seven.base.css
index 844712d..7712e4f 100644
--- a/core/themes/seven/seven.base.css
+++ b/core/themes/seven/seven.base.css
@@ -11,8 +11,10 @@ a,
   color: #0074bd;
   text-decoration: none;
 }
-a:hover,
-.link:hover {
+ a:hover,
+.link:hover,
+a:focus,
+.link:focus {
   text-decoration: underline;
 }
 hr {
diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
index eae4ac8..3c15c3f 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -64,9 +64,9 @@ ul.menu li.expanded {
 .skip-link:active {
   outline: 0;
 }
-.skip-link.visually-hidden.focusable:active,
+.skip-link.visually-hidden.focusable:hover,
 .skip-link.visually-hidden.focusable:focus,
-.skip-link.visually-hidden.focusable:hover
+.skip-link.visually-hidden.focusable:active
 {
   position: absolute !important;
 }
@@ -180,7 +180,8 @@ ul.menu li.expanded {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.tabs__tab:hover {
+.tabs__tab:hover,
+.tabs__tab:focus {
   color: #008ee6;
   background-color: #fafaf7;
 }
@@ -381,7 +382,8 @@ li.tabs__tab a {
   border-left: 2px solid #004f80;
   padding-left: 15px;
 }
-.tabs.secondary .tabs__tab:hover {
+.tabs.secondary .tabs__tab:hover,
+.tabs.secondary .tabs__tab:focus {
   color: #008ee6;
   border-left: 2px solid #008ee6;
   padding-left: 15px;
@@ -416,7 +418,8 @@ li.tabs__tab a {
 .is-horizontal .tabs.secondary .tabs__tab.active {
   border-bottom-color: #004f80;
 }
-.is-horizontal .tabs.secondary .tabs__tab:hover {
+.is-horizontal .tabs.secondary .tabs__tab:hover,
+.is-horizontal .tabs.secondary .tabs__tab:focus {
   border-bottom-color: #008ee6;
 }
 
@@ -543,8 +546,8 @@ div.submitted {
   margin: 0 5px;
   font-weight: 700;
 }
-.item-list .pager a:focus,
-.item-list .pager a:hover {
+.item-list .pager a:hover,
+.item-list .pager a:focus {
   border-bottom-color: #3395d2;
   color: #3395d2;
 }
@@ -592,7 +595,8 @@ tr {
 thead > tr {
   border-bottom: 1px solid #000;
 }
-tbody tr:hover {
+tbody tr:hover,
+tbody tr:focus {
   background: #f7fcff;
 }
 td,
@@ -638,17 +642,17 @@ th.active img {
 th.active > a:after {
   border-bottom-color: #004875;
 }
-th > a:focus,
 th > a:hover,
-th.active > a:focus,
-th.active > a:hover {
+th > a:focus,
+th.active > a:hover,
+th.active > a:focus {
   color: #008ee6;
   text-decoration: none;
 }
-th > a:focus:after,
 th > a:hover:after,
-th.active > a:focus:after,
-th.active > a:hover:after {
+th > a:focus:after,
+th.active > a:hover:after,
+th.active > a:focus:after {
   border-bottom-color: #008ee6;
 }
 td .item-list ul {
@@ -1258,7 +1262,8 @@ details.fieldset-no-legend {
   background-position: center 3px;
 }
 
-.views-displays .secondary a:hover > .icon.add {
+.views-displays .secondary a:hover > .icon.add,
+.views-displays .secondary a:focus > .icon.add {
   background-position: center -25px;
 }
 
@@ -1266,7 +1271,8 @@ details.fieldset-no-legend {
   border-radius: 7px 7px 0 0;
 }
 
-.views-displays .secondary .open > a:hover {
+.views-displays .secondary .open > a:hover,
+.views-displays .secondary .open > a:focus {
   background-color: #f1f1f1;
   color: #008BCB;
 }