diff --git a/core/themes/seven/css/base/elements.css b/core/themes/seven/css/base/elements.css
index dc08f9fbea8eaa49ea726ccd2d0af7c5018e6fcc..4edbe0a430fe7d735794a34e58cc1311c7a9db07 100644
--- a/core/themes/seven/css/base/elements.css
+++ b/core/themes/seven/css/base/elements.css
@@ -12,8 +12,11 @@ a,
   text-decoration: none;
 }
 a:hover,
-.link:hover {
+.link:hover,
+a:focus,
+.link:focus {
   text-decoration: underline;
+  outline: 0;
 }
 hr {
   margin: 0;
diff --git a/core/themes/seven/css/components/buttons.theme.css b/core/themes/seven/css/components/buttons.theme.css
index e5f0e1d4a9a76230550d5e56e23d3fe4d819b675..f7152fc56300794d35d76bb6f19eeb1e6ad2522f 100644
--- a/core/themes/seven/css/components/buttons.theme.css
+++ b/core/themes/seven/css/components/buttons.theme.css
@@ -28,8 +28,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:   linear-gradient(to bottom, #fcfcfa, #e9e9dd);
@@ -64,8 +64,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:   linear-gradient(to bottom, #0c97ed, #1f86c7);
@@ -129,8 +129,8 @@
   color: #0074bd;
   text-decoration: none;
 }
-.link:focus,
-.link:hover {
+.link:hover,
+.link:focus {
   color: #008ee6;
   text-decoration: underline;
 }
@@ -155,8 +155,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 40e789cca415ef1bcba11222b246c69d06e809dd..9b91d626034e86200accc71385806d53d38f4c1c 100644
--- a/core/themes/seven/css/components/dropbutton.component.css
+++ b/core/themes/seven/css/components/dropbutton.component.css
@@ -141,8 +141,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: linear-gradient(to bottom, #fcfcfa, #e9e9dd);
@@ -150,7 +150,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/pager.css b/core/themes/seven/css/components/pager.css
index 7929c26b37a6d0bbda27507ea3f3263c9e31dfe0..6b5f4b4c32d0dc5e5fdcb7b7b02615013fae851c 100644
--- a/core/themes/seven/css/components/pager.css
+++ b/core/themes/seven/css/components/pager.css
@@ -28,8 +28,8 @@
   color: #2a678c;
   font-weight: 700;
 }
-.pager__item a:focus,
-.pager__item a:hover {
+.pager__item a:hover,
+.pager__item a:focus {
   border-bottom-color: #3395d2;
   color: #3395d2;
 }
diff --git a/core/themes/seven/css/components/quickedit.css b/core/themes/seven/css/components/quickedit.css
index e7de0e1f5b6361b8a91f560714f1eab897ecc404..5949c08f4a8e89a24896cd32104b6c9cda8b6819 100644
--- a/core/themes/seven/css/components/quickedit.css
+++ b/core/themes/seven/css/components/quickedit.css
@@ -30,10 +30,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:   linear-gradient(to bottom, #0c97ed, #1f86c7);
@@ -41,7 +41,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/css/components/skip-link.css b/core/themes/seven/css/components/skip-link.css
index ce0793ce603fcc5d084a710dbd8e1916611b38b2..df173abd6b27a0854d5e2fecc4853959811adfc5 100644
--- a/core/themes/seven/css/components/skip-link.css
+++ b/core/themes/seven/css/components/skip-link.css
@@ -34,9 +34,9 @@
 .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;
 }
diff --git a/core/themes/seven/css/components/tables.css b/core/themes/seven/css/components/tables.css
index 8242d85c2b4379a1452c01a38e157e7dfe3e630d..524c83be572d02c525bb9dd4a97e9e00ffc600ac 100644
--- a/core/themes/seven/css/components/tables.css
+++ b/core/themes/seven/css/components/tables.css
@@ -33,7 +33,8 @@ tr {
 thead > tr {
   border-bottom: 1px solid #000;
 }
-tbody tr:hover {
+tbody tr:hover,
+tbody tr:focus {
   background: #f7fcff;
 }
 td,
@@ -80,17 +81,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 {
diff --git a/core/themes/seven/css/components/tabs.css b/core/themes/seven/css/components/tabs.css
index b57dd32cbf11d10d67d0a1aad06b9a5f1d22c0c0..fe8d8fc945300ec3958ac2b8eef438a539666f70 100644
--- a/core/themes/seven/css/components/tabs.css
+++ b/core/themes/seven/css/components/tabs.css
@@ -46,7 +46,8 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.tabs__tab:hover {
+.tabs__tab:hover,
+.tabs__tab:focus {
   color: #008ee6;
   background-color: #fafaf7;
 }
@@ -238,7 +239,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;
@@ -273,6 +275,7 @@ 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;
 }
diff --git a/core/themes/seven/css/components/tour.theme.css b/core/themes/seven/css/components/tour.theme.css
index 3a9b723f4575d29c03165a1b6d23570506f6e047..6353df374a4223b6c6c80647e49ed2a28f069c8e 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/css/components/views-ui.css b/core/themes/seven/css/components/views-ui.css
index ed333662c22a8359ae01598667b4c1762e83d8b8..a4559ae686154d589411782dab65608bb280da17 100644
--- a/core/themes/seven/css/components/views-ui.css
+++ b/core/themes/seven/css/components/views-ui.css
@@ -181,7 +181,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;
 }