Index: src/wp-content/themes/twentyfifteen/css/ie.css
===================================================================
--- src/wp-content/themes/twentyfifteen/css/ie.css	(revision 30152)
+++ src/wp-content/themes/twentyfifteen/css/ie.css	(working copy)
@@ -538,14 +538,14 @@
 	padding: 4.5454% 9.0909%;
 }
 
-.posted-on a:before,
-.byline a:before,
-.cat-links span + a:before,
-.tags-links span + a:before,
-.comments-link a:before,
-.entry-format a:before,
-.edit-link a:before,
-.full-size-link a:before {
+.posted-on:before,
+.byline:before,
+.cat-links:before,
+.tags-links:before,
+.comments-link:before,
+.entry-format:before,
+.edit-link:before,
+.full-size-link:before {
 	top: 4px;
 }
 
@@ -649,8 +649,8 @@
 	padding-left: 5.5em;
 }
 
-.comment-metadata .edit-link a:before,
-.pingback .edit-link a:before {
+.comment-metadata .edit-link:before,
+.pingback .edit-link:before {
 	top: 8px;
 }
 
Index: src/wp-content/themes/twentyfifteen/inc/custom-header.php
===================================================================
--- src/wp-content/themes/twentyfifteen/inc/custom-header.php	(revision 30152)
+++ src/wp-content/themes/twentyfifteen/inc/custom-header.php	(working copy)
@@ -227,11 +227,19 @@
 			color: %1$s;
 		}
 
-		.secondary-toggle:focus {
-			outline-color: %1$s;
+		.site-title a {
+			outline-color: %1$s; /* Fallback for IE7 and IE8 */
+			outline-color: %2$s;
 		}
 
-		.secondary-toggle:hover {
+		.secondary-toggle {
+			border-color: %1$s; /* Fallback for IE7 and IE8 */
+			border-color: %3$s;
+		}
+
+		.secondary-toggle:hover,
+		.secondary-toggle:focus {
+			border-color: %1$s; /* Fallback for IE7 and IE8 */
 			border-color: %4$s;
 		}
 
@@ -244,10 +252,6 @@
 				color: %1$s;
 			}
 
-			.dropdown-toggle:focus {
-				outline-color: %1$s;
-			}
-
 			.widget button,
 			.widget input[type="button"],
 			.widget input[type="reset"],
@@ -256,6 +260,10 @@
 				background-color: %1$s;
 			}
 
+			.textwidget a {
+				border-color: %1$s;
+			}
+
 			.main-navigation .menu-item-description,
 			.main-navigation a:hover,
 			.main-navigation a:focus,
@@ -274,7 +282,15 @@
 			}
 
 			.widget_calendar tbody a:hover,
-			.widget_calendar tbody a:focus {
+			.widget_calendar tbody a:focus,
+			.widget button:hover,
+			.widget input[type="button"]:hover,
+			.widget input[type="reset"]:hover,
+			.widget input[type="submit"]:hover,
+			.widget button:focus,
+			.widget input[type="button"]:focus,
+			.widget input[type="reset"]:focus,
+			.widget input[type="submit"]:focus {
 				background-color: %1$s; /* Fallback for IE7 and IE8 */
 				background-color: %2$s;
 			}
@@ -283,6 +299,11 @@
 				border-color: %2$s;
 			}
 
+			.sidebar a:focus {
+				outline-color: %1$s; /* Fallback for IE7 and IE8 */
+				outline-color: %2$s;
+			}
+
 			.main-navigation ul,
 			.main-navigation li,
 			.secondary-toggle,
@@ -313,6 +334,15 @@
 				border-color: %1$s; /* Fallback for IE7 and IE8 */
 				border-color: %4$s;
 			}
+
+			.dropdown-toggle:focus,
+			.widget button:focus,
+			.widget input[type="button"]:focus,
+			.widget input[type="reset"]:focus,
+			.widget input[type="submit"]:focus {
+				outline-color: %1$s; /* Fallback for IE7 and IE8 */
+				outline-color: %4$s;
+			}
 		}
 	';
 
Index: src/wp-content/themes/twentyfifteen/inc/customizer.php
===================================================================
--- src/wp-content/themes/twentyfifteen/inc/customizer.php	(revision 30152)
+++ src/wp-content/themes/twentyfifteen/inc/customizer.php	(working copy)
@@ -327,9 +327,15 @@
 		.entry-summary a,
 		.page-content a,
 		.comment-content a,
+		.pingback .comment-body > a,
 		.author-description a,
+		.taxonomy-description a,
+		.textwidget a,
+		.entry-footer a:hover,
+		.comment-metadata a:hover,
+		.pingback .edit-link a:hover,
 		.comment-list .reply a:hover,
-		.comment-list .reply a:focus {
+		.site-info a:hover {
 			border-color: %4$s;
 		}
 
@@ -367,16 +373,6 @@
 		.comment-navigation,
 		.comment-navigation a,
 		.widget,
-		.entry-content a:hover,
-		.entry-content a:focus,
-		.entry-summary a:hover,
-		.entry-summary a:focus,
-		.page-content a:hover,
-		.page-content a:focus,
-		.comment-content a:hover,
-		.comment-content a:focus,
-		.author-description a:hover,
-		.author-description a:focus,
 		.author-heading,
 		.entry-footer,
 		.entry-footer a,
@@ -386,7 +382,8 @@
 		.comment-author,
 		.comment-metadata,
 		.comment-metadata a,
-		.pingback .comment-edit-link,
+		.pingback .edit-link,
+		.pingback .edit-link a,
 		.post-password-form label,
 		.comment-form label,
 		.comment-notes,
@@ -405,16 +402,8 @@
 
 		/* Secondary Text Color */
 		blockquote,
-		.entry-content a:hover,
-		.entry-content a:focus,
-		.entry-summary a:hover,
-		.entry-summary a:focus,
-		.page-content a:hover,
-		.page-content a:focus,
-		.comment-content a:hover,
-		.comment-content a:focus,
-		.author-description a:hover,
-		.author-description a:focus {
+		.logged-in-as a:hover,
+		.comment-author a:hover {
 			border-color: %4$s; /* Fallback for IE7 and IE8 */
 			border-color: %5$s;
 		}
@@ -467,25 +456,28 @@
 		}
 
 		/* Border Focus Color */
+		a:focus,
+		button:focus,
+		input[type="button"]:focus,
+		input[type="reset"]:focus,
+		input[type="submit"]:focus {
+			outline-color: %4$s; /* Fallback for IE7 and IE8 */
+			outline-color: %7$s;
+		}
+
 		input:focus,
-		textarea:focus {
+		textarea:focus,
+		.secondary-toggle:hover,
+		.secondary-toggle:focus {
 			border-color: %4$s; /* Fallback for IE7 and IE8 */
 			border-color: %7$s;
 		}
 
 		/* Sidebar Link Color */
-		.secondary-toggle:hover {
-			border-color: %8$s;
-		}
-
 		.secondary-toggle:before {
 			color: %8$s;
 		}
 
-		.secondary-toggle:focus {
-			outline-color: %8$s;
-		}
-
 		.site-title a,
 		.site-description {
 			color: %8$s;
@@ -554,10 +546,6 @@
 				color: %8$s;
 			}
 
-			.dropdown-toggle:focus {
-				outline-color: %8$s;
-			}
-
 			/* Sidebar Text Color */
 			.secondary a:hover,
 			.secondary a:focus,
Index: src/wp-content/themes/twentyfifteen/rtl.css
===================================================================
--- src/wp-content/themes/twentyfifteen/rtl.css	(revision 30152)
+++ src/wp-content/themes/twentyfifteen/rtl.css	(working copy)
@@ -276,14 +276,14 @@
 	margin: 0 0 1.6em 1.6em;
 }
 
-.posted-on a:before,
-.byline a:before,
-.cat-links span + a:before,
-.tags-links span + a:before,
-.comments-link a:before,
-.entry-format a:before,
-.edit-link a:before,
-.full-size-link a:before {
+.posted-on:before,
+.byline:before,
+.cat-links:before,
+.tags-links:before,
+.comments-link:before,
+.entry-format:before,
+.edit-link:before,
+.full-size-link:before {
 	margin-right: auto;
 	margin-left: 2px;
 }
Index: src/wp-content/themes/twentyfifteen/style.css
===================================================================
--- src/wp-content/themes/twentyfifteen/style.css	(revision 30152)
+++ src/wp-content/themes/twentyfifteen/style.css	(working copy)
@@ -140,7 +140,8 @@
 }
 
 a:focus {
-	outline: thin dotted;
+	outline: 2px solid #c1c1c1;
+	outline: 2px solid rgba(51, 51, 51, 0.3);
 }
 
 a:hover,
@@ -165,14 +166,14 @@
 .comment-reply-title small a:before,
 .comment-navigation .nav-next a:after,
 .comment-navigation .nav-previous a:before,
-.posted-on a:before,
-.byline a:before,
-.cat-links span + a:before,
-.tags-links span + a:before,
-.comments-link a:before,
-.entry-format a:before,
-.edit-link a:before,
-.full-size-link a:before,
+.posted-on:before,
+.byline:before,
+.cat-links:before,
+.tags-links:before,
+.comments-link:before,
+.entry-format:before,
+.edit-link:before,
+.full-size-link:before,
 .pagination .prev:before,
 .pagination .next:before,
 .image-navigation a:before,
@@ -535,9 +536,16 @@
 input[type="submit"]:focus {
 	background-color: #707070;
 	background-color: rgba(51, 51, 51, 0.7);
-	outline: 0;
 }
 
+button:focus,
+input[type="button"]:focus,
+input[type="reset"]:focus,
+input[type="submit"]:focus {
+	outline: 2px solid #c1c1c1;
+	outline: 2px solid rgba(51, 51, 51, 0.3);
+}
+
 input[type="checkbox"],
 input[type="radio"] {
 	padding: 0;
@@ -715,7 +723,7 @@
 }
 
 .dropdown-toggle:focus {
-	outline: dotted thin #333;
+	outline-width: 1px;
 }
 
 .dropdown-toggle.toggle-on:after {
@@ -876,22 +884,19 @@
 	left: 0;
 }
 
-.secondary-toggle:hover {
+.secondary-toggle:hover,
+.secondary-toggle:focus {
 	background-color: transparent;
+	border: 1px solid #c1c1c1;
 	border: 1px solid rgba(51, 51, 51, 0.3);
+	outline: 0;
 }
 
-.secondary-toggle:focus {
-	background-color: transparent;
-	border: 1px solid transparent;
-	outline: dotted thin #333;
-}
-
 .secondary-toggle.toggled-on:before {
 	content: "\f405";
 	font-size: 32px;
-	top: 1px;
-	left: 0;
+	top: 0;
+	left: -1px;
 }
 
 .post-navigation {
@@ -1504,11 +1509,20 @@
 	opacity: 0.8;
 }
 
-.widget_text > div > :last-child {
+.textwidget > :last-child {
 	margin-bottom: 0;
 }
 
+.textwidget a {
+	border-bottom: 1px solid #333;
+}
 
+.textwidget a:hover,
+.textwidget a:focus {
+	border-bottom: 0;
+}
+
+
 /**
  * 12.0 Content
  */
@@ -1700,7 +1714,8 @@
 .entry-content a,
 .entry-summary a,
 .page-content a,
-.comment-content a {
+.comment-content a,
+.pingback .comment-body > a {
 	border-bottom: 1px solid #333;
 }
 
@@ -1711,11 +1726,10 @@
 .page-content a:hover,
 .page-content a:focus,
 .comment-content a:hover,
-.comment-content a:focus {
-	border-color: #707070;
-	border-color: rgba(51, 51, 51, 0.7);
-	color: #707070;
-	color: rgba(51, 51, 51, 0.7);
+.comment-content a:focus,
+.pingback .comment-body > a:hover,
+.pingback .comment-body > a:focus {
+	border-bottom: 0;
 }
 
 .entry-content .more-link {
@@ -1781,8 +1795,7 @@
 
 .author-description a:hover,
 .author-description a:focus {
-	border-color: rgba(51, 51, 51, 0.7);
-	color: rgba(51, 51, 51, 0.7);
+	border-bottom: 0;
 }
 
 .author-description > :last-child {
@@ -1815,6 +1828,10 @@
 	color: rgba(51, 51, 51, 0.7);
 }
 
+.entry-footer a:hover {
+	border-bottom: 1px solid #333;
+}
+
 .entry-footer a:hover,
 .entry-footer a:focus {
 	color: #333;
@@ -1835,19 +1852,18 @@
 	display: none;
 }
 
-.sticky .posted-on,
-.sticky .posted-on + .byline:before {
+.sticky .posted-on {
 	display: none;
 }
 
-.posted-on a:before,
-.byline a:before,
-.cat-links span + a:before,
-.tags-links span + a:before,
-.comments-link a:before,
-.entry-format a:before,
-.edit-link a:before,
-.full-size-link a:before {
+.posted-on:before,
+.byline:before,
+.cat-links:before,
+.tags-links:before,
+.comments-link:before,
+.entry-format:before,
+.edit-link:before,
+.full-size-link:before {
 	margin-right: 2px;
 	position: relative;
 }
@@ -1862,67 +1878,67 @@
 	margin-right: 1em;
 }
 
-.format-aside .entry-format a:before {
+.format-aside .entry-format:before {
 	content: "\f101";
 }
 
-.format-image .entry-format a:before {
+.format-image .entry-format:before {
 	content: "\f473";
 }
 
-.format-gallery .entry-format a:before {
+.format-gallery .entry-format:before {
 	content: "\f103";
 }
 
-.format-video .entry-format a:before {
+.format-video .entry-format:before {
 	content: "\f104";
 }
 
-.format-status .entry-format a:before {
+.format-status .entry-format:before {
 	content: "\f105";
 }
 
-.format-quote .entry-format a:before {
+.format-quote .entry-format:before {
 	content: "\f106";
 }
 
-.format-link .entry-format a:before {
+.format-link .entry-format:before {
 	content: "\f107";
 }
 
-.format-chat .entry-format a:before {
+.format-chat .entry-format:before {
 	content: "\f108";
 }
 
-.format-audio .entry-format a:before {
+.format-audio .entry-format:before {
 	content: "\f109";
 }
 
-.posted-on a:before {
+.posted-on:before {
 	content: "\f307";
 }
 
-.byline a:before {
+.byline:before {
 	content: "\f304";
 }
 
-.cat-links span + a:before {
+.cat-links:before {
 	content: "\f301";
 }
 
-.tags-links span + a:before {
+.tags-links:before {
 	content: "\f302";
 }
 
-.comments-link a:before {
+.comments-link:before {
 	content: "\f300";
 }
 
-.full-size-link a:before {
+.full-size-link:before {
 	content: "\f402";
 }
 
-.edit-link a:before {
+.edit-link:before {
 	content: "\f411";
 }
 
@@ -1945,6 +1961,15 @@
 	padding-top: 0.4em;
 }
 
+.taxonomy-description a {
+	border-bottom: 1px solid #333;
+}
+
+.taxonomy-description a:hover,
+.taxonomy-description a:focus {
+	border-bottom: 0;
+}
+
 .taxonomy-description > :last-child {
 	margin-bottom: 0;
 }
@@ -2138,6 +2163,11 @@
 	margin-bottom: 0.4em;
 }
 
+.comment-author a:hover {
+	border-bottom: 1px solid #707070;
+	border-bottom: 1px solid rgba(51, 51, 51, 0.7);
+}
+
 .comment-author .avatar {
 	border-radius: 50%;
 	float: left;
@@ -2174,6 +2204,11 @@
 }
 
 .comment-metadata a:hover,
+.pingback .edit-link a:hover{
+	border-bottom: 1px solid #333;
+}
+
+.comment-metadata a:hover,
 .comment-metadata a:focus,
 .pingback .edit-link a:hover,
 .pingback .edit-link a:focus {
@@ -2192,7 +2227,7 @@
 	margin-left: 1em;
 }
 
-.pingback .edit-link a:before {
+.pingback .edit-link:before {
 	top: 5px;
 }
 
@@ -2233,6 +2268,7 @@
 .comment-list .reply a:focus {
 	border-color: #333;
 	color: #333;
+	outline: 0;
 }
 
 .comment-form {
@@ -2272,6 +2308,10 @@
 	margin-bottom: 2em;
 }
 
+.logged-in-as a:hover {
+	border-bottom: 1px solid #333;
+}
+
 .no-comments {
 	border-top: 1px solid #eaeaea;
 	border-top: 1px solid rgba(51, 51, 51, 0.1);
@@ -2335,6 +2375,10 @@
 	color: rgba(51, 51, 51, 0.7);
 }
 
+.site-info a:hover {
+	border-bottom: 1px solid #333;
+}
+
 .site-info a:hover,
 .site-info a:focus {
 	color: #333;
@@ -3136,14 +3180,14 @@
 		top: 3px;
 	}
 
-	.posted-on a:before,
-	.byline a:before,
-	.cat-links span + a:before,
-	.tags-links span + a:before,
-	.comments-link a:before,
-	.entry-format a:before,
-	.edit-link a:before,
-	.full-size-link a:before {
+	.posted-on:before,
+	.byline:before,
+	.cat-links:before,
+	.tags-links:before,
+	.comments-link:before,
+	.entry-format:before,
+	.edit-link:before,
+	.full-size-link:before {
 		top: 3px;
 	}
 
@@ -3222,11 +3266,11 @@
 		width: 42px;
 	}
 
-	.comment-metadata .edit-link a:before {
+	.comment-metadata .edit-link:before {
 		top: 2px;
 	}
 
-	.pingback .edit-link a:before {
+	.pingback .edit-link:before {
 		top: 6px;
 	}
 
@@ -3666,14 +3710,14 @@
 		top: 0;
 	}
 
-	.posted-on a:before,
-	.byline a:before,
-	.cat-links span + a:before,
-	.tags-links span + a:before,
-	.comments-link a:before,
-	.entry-format a:before,
-	.edit-link a:before,
-	.full-size-link a:before {
+	.posted-on:before,
+	.byline:before,
+	.cat-links:before,
+	.tags-links:before,
+	.comments-link:before,
+	.entry-format:before,
+	.edit-link:before,
+	.full-size-link:before {
 		top: 4px;
 	}
 
@@ -3747,11 +3791,11 @@
 		line-height: 2;
 	}
 
-	.comment-metadata .edit-link a:before {
+	.comment-metadata .edit-link:before {
 		top: 8px;
 	}
 
-	.pingback .edit-link a:before {
+	.pingback .edit-link:before {
 		top: 8px;
 	}
 
@@ -4312,14 +4356,14 @@
 		padding: 5% 10%;
 	}
 
-	.posted-on a:before,
-	.byline a:before,
-	.cat-links span + a:before,
-	.tags-links span + a:before,
-	.comments-link a:before,
-	.entry-format a:before,
-	.edit-link a:before,
-	.full-size-link a:before {
+	.posted-on:before,
+	.byline:before,
+	.cat-links:before,
+	.tags-links:before,
+	.comments-link:before,
+	.entry-format:before,
+	.edit-link:before,
+	.full-size-link:before {
 		top: 0;
 	}
 
@@ -4406,11 +4450,11 @@
 		width: 24px;
 	}
 
-	.comment-metadata .edit-link a:before {
+	.comment-metadata .edit-link:before {
 		top: 3px;
 	}
 
-	.pingback .edit-link a:before {
+	.pingback .edit-link:before {
 		top: 5px;
 	}
 
@@ -4837,14 +4881,14 @@
 		top: 3px;
 	}
 
-	.posted-on a:before,
-	.byline a:before,
-	.cat-links span + a:before,
-	.tags-links span + a:before,
-	.comments-link a:before,
-	.entry-format a:before,
-	.edit-link a:before,
-	.full-size-link a:before {
+	.posted-on:before,
+	.byline:before,
+	.cat-links:before,
+	.tags-links:before,
+	.comments-link:before,
+	.entry-format:before,
+	.edit-link:before,
+	.full-size-link:before {
 		top: 3px;
 	}
 
@@ -4923,11 +4967,11 @@
 		left: 6px;
 	}
 
-	.comment-metadata .edit-link a:before {
+	.comment-metadata .edit-link:before {
 		top: 6px;
 	}
 
-	.pingback .edit-link a:before {
+	.pingback .edit-link:before {
 		top: 6px;
 	}
 
@@ -5349,14 +5393,14 @@
 		top: 0;
 	}
 
-	.posted-on a:before,
-	.byline a:before,
-	.cat-links span + a:before,
-	.tags-links span + a:before,
-	.comments-link a:before,
-	.entry-format a:before,
-	.edit-link a:before,
-	.full-size-link a:before {
+	.posted-on:before,
+	.byline:before,
+	.cat-links:before,
+	.tags-links:before,
+	.comments-link:before,
+	.entry-format:before,
+	.edit-link:before,
+	.full-size-link:before {
 		top: 4px;
 	}
 
@@ -5430,11 +5474,11 @@
 		top: 8px;
 	}
 
-	.comment-metadata .edit-link a:before {
+	.comment-metadata .edit-link:before {
 		top: 8px;
 	}
 
-	.pingback .edit-link a:before {
+	.pingback .edit-link:before {
 		top: 8px;
 	}