diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 4642b13f39..066ec2f005 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -627,7 +627,6 @@ li {
 	font-size: 0.75em;
 	text-decoration: none;
 	cursor: inherit;
-	outline-style: none;
 }
 
 @media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
@@ -1173,10 +1172,6 @@ optgroup, select {
 	color: #000;
 }
 
-select:focus {
-	outline-style: none;
-}
-
 optgroup {
 	font-size: 1.00em;
 	font-weight: bold;
@@ -1442,7 +1437,6 @@ input:focus, textarea:focus {
 	border: 1px solid #BC2A4D;
 	background-color: #E9E9E2;
 	color: #BC2A4D;
-	outline-style: none;
 }
 
 @media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
@@ -1592,11 +1586,6 @@ input.disabled {
 	color: #666666;
 }
 
-/* Focus states */
-input.button1:focus, input.button2:focus {
-	outline-style: none;
-}
-
 /* jQuery popups
 ---------------------------------------- */
 .phpbb_alert {
diff --git a/phpBB/styles/prosilver/theme/base.css b/phpBB/styles/prosilver/theme/base.css
index 7206128e7a..0da5fb7750 100644
--- a/phpBB/styles/prosilver/theme/base.css
+++ b/phpBB/styles/prosilver/theme/base.css
@@ -112,3 +112,11 @@ ul {
 abbr[title] {
 	text-decoration: none;
 }
+
+/**
+ * Fixes accessibility issue introduced by `normalize.css` by re-adding outline
+ * to elements covered by the mouse when they are navigated into via keyboard
+ */
+a:hover {
+	outline: revert;
+}
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index ecf92f3018..61a8f14a2b 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -25,7 +25,6 @@
 .button:focus,
 .button:hover {
  	text-decoration: none;
- 	outline: none;
 }
 
 .caret {
diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index ab9ac7a44c..8360d1e008 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -27,10 +27,6 @@ select {
 	font-size: 1em;
 }
 
-select:focus {
-	outline-style: none;
-}
-
 option {
 	padding-right: 1em;
 }
@@ -268,8 +264,6 @@ fieldset.submit-buttons input {
 	max-width: 100%;
 	font-size: 1.2em;
 	resize: vertical;
-	outline: 3px dashed transparent;
-	outline-offset: -4px;
 	-webkit-transition: all .5s ease, height 1ms linear;
 	-moz-transition: all .5s ease, height 1ms linear;
 	-ms-transition: all .5s ease, height 1ms linear;
@@ -296,7 +290,6 @@ fieldset.submit-buttons input {
 
 .inputbox:hover, .inputbox:focus {
 	border: 1px solid transparent;
-	outline-style: none;
 }
 
 input.inputbox	{ width: 85%; }
@@ -383,11 +376,6 @@ input.disabled {
 	font-weight: normal;
 }
 
-/* Focus states */
-input.button1:focus, input.button2:focus, input.button3:focus {
-	outline-style: none;
-}
-
 /* Topic and forum Search */
 .search-box {
 	float: left;