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 33b3eee..e2f843e 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;
 }
@@ -193,7 +193,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;
 }
@@ -394,7 +395,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;
@@ -429,7 +431,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;
 }
 
@@ -553,8 +556,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;
 }
@@ -600,7 +603,8 @@ tr {
 thead > tr {
   border-bottom: 1px solid #000;
 }
-tbody tr:hover {
+tbody tr:hover,
+tbody tr:focus {
   background: #f7fcff;
 }
 td,
@@ -646,17 +650,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 {
@@ -1083,11 +1087,13 @@ div.admin-options div.form-item {
   background-image: linear-gradient(180deg, rgba(255, 255, 255, 0), #e7e7e7);
   border-radius: 5px;
 }
-.js .dropbutton-widget:hover {
+.js .dropbutton-widget:hover,
+.js .dropbutton-widget:focus {
   background-color: #f0f0f0;
   border-color: #b8b8b8;
 }
-.js .dropbutton-multiple.open .dropbutton-widget:hover {
+.js .dropbutton-multiple.open .dropbutton-widget:hover,
+.js .dropbutton-multiple.open .dropbutton-widget:focus {
   background-color: #fff;
 }
 .dropbutton-content li:first-child > * {
@@ -1097,8 +1103,8 @@ div.admin-options div.form-item {
   text-overflow: clip;
 }
 
-.js .form-actions .dropbutton-widget:focus,
-.js .form-actions .dropbutton-widget:hover {
+.js .form-actions .dropbutton-widget:hover,
+.js .form-actions .dropbutton-widget:focus {
   background-color: #73b3dd;
   border: 1px solid #6ea3bf;
   border-bottom-color: #4680a0;
@@ -1108,10 +1114,12 @@ div.admin-options div.form-item {
   border: 1px solid #36647c;
   border-bottom-color: #284657;
 }
-.js .form-actions .dropbutton-multiple.open .dropbutton-widget:hover {
+.js .form-actions .dropbutton-multiple.open .dropbutton-widget:hover,
+.js .form-actions .dropbutton-multiple.open .dropbutton-widget:focus {
   background-color: #9dcae7;
 }
-.js .form-actions .dropbutton-multiple.open .dropbutton-action:hover {
+.js .form-actions .dropbutton-multiple.open .dropbutton-action:hover,
+.js .form-actions .dropbutton-multiple.open .dropbutton-action:focus {
   background-color: #73b3dd;
 }
 
@@ -1290,7 +1298,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;
 }
 
@@ -1298,7 +1307,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;
 }
@@ -1531,7 +1541,8 @@ details.fieldset-no-legend {
   border-radius: 0;
   background: none;
 }
-.form-actions .dropbutton-wrapper input:hover {
+.form-actions .dropbutton-wrapper input:hover,
+.form-actions .dropbutton-wrapper input:focus {
   background: none;
   border: none;
 }
@@ -1589,6 +1600,7 @@ details.fieldset-no-legend {
   color: #ffffff;
   text-shadow: 1px 1px 1px rgba(31, 83, 131, 0.8);
 }
-.js .form-actions .dropbutton-multiple.open .dropbutton-action:hover {
+.js .form-actions .dropbutton-multiple.open .dropbutton-action:hover,
+.js .form-actions .dropbutton-multiple.open .dropbutton-action:focus {
   background-color: #50a0e9;
 }