Index: src/wp-content/themes/twentyfifteen/css/ie.css
===================================================================
--- src/wp-content/themes/twentyfifteen/css/ie.css	(revision 31095)
+++ src/wp-content/themes/twentyfifteen/css/ie.css	(working copy)
@@ -125,9 +125,8 @@
 	padding: 0.75em 0;
 }
 
-.main-navigation .page_item_has_children > a,
-.main-navigation .main-navigation .menu-item-has-children > a {
-	padding-right: 53px;
+.main-navigation .menu-item-has-children > a {
+	padding-right: 48px;
 }
 
 .main-navigation .menu-item-description {
@@ -839,10 +838,9 @@
 	margin-left: auto;
 }
 
-.rtl .main-navigation .page_item_has_children > a,
-.rtl .main-navigation .main-navigation .menu-item-has-children > a {
+.rtl .main-navigation .menu-item-has-children > a {
 	padding-right: 0;
-	padding-left: 53px;
+	padding-left: 48px;
 }
 
 .rtl .secondary-toggle {
Index: src/wp-content/themes/twentyfifteen/js/functions.js
===================================================================
--- src/wp-content/themes/twentyfifteen/js/functions.js	(revision 31095)
+++ src/wp-content/themes/twentyfifteen/js/functions.js	(working copy)
@@ -11,7 +11,7 @@
 	    topOffset = 0, bodyHeight, sidebarHeight, resizeTimer;
 
 	// Add dropdown toggle that display child menu items.
-	$( '.main-navigation .page_item_has_children > a, .main-navigation .menu-item-has-children > a' ).after( '<button class="dropdown-toggle" aria-expanded="false">' + screenReaderText.expand + '</button>' );
+	$( '.main-navigation .menu-item-has-children > a' ).after( '<button class="dropdown-toggle" aria-expanded="false">' + screenReaderText.expand + '</button>' );
 
 	$( '.dropdown-toggle' ).click( function( e ) {
 		var _this = $( this );
Index: src/wp-content/themes/twentyfifteen/rtl.css
===================================================================
--- src/wp-content/themes/twentyfifteen/rtl.css	(revision 31095)
+++ src/wp-content/themes/twentyfifteen/rtl.css	(working copy)
@@ -156,7 +156,6 @@
 	margin-left: auto;
 }
 
-.main-navigation .page_item_has_children > a,
 .main-navigation .menu-item-has-children > a {
 	padding-right: 0;
 	padding-left: 48px;
@@ -477,12 +476,6 @@
 		margin-left: auto;
 	}
 
-	.main-navigation .page_item_has_children > a,
-	.main-navigation .main-navigation .menu-item-has-children > a {
-		padding-right: 0;
-		padding-left: 54px;
-	}
-
 	blockquote.alignright,
 	.wp-caption.alignright
 	img.alignright {
@@ -567,12 +560,6 @@
 		padding-left: 0;
 	}
 
-	.main-navigation .page_item_has_children > a,
-	.main-navigation .main-navigation .menu-item-has-children > a {
-		padding-right: 0;
-		padding-left: 53px;
-	}
-
 	blockquote.alignright,
 	.wp-caption.alignright
 	img.alignright {
@@ -652,10 +639,9 @@
 		padding-left: 0;
 	}
 
-	.main-navigation .page_item_has_children > a,
 	.main-navigation .menu-item-has-children > a {
 		padding-right: 0;
-		padding-left: 35px;
+		padding-left: 30px;
 	}
 
 	blockquote.alignright,
@@ -729,10 +715,9 @@
 		padding-left: 0;
 	}
 
-	.main-navigation .page_item_has_children > a,
 	.main-navigation .menu-item-has-children > a {
 		padding-right: 0;
-		padding-left: 33px;
+		padding-left: 34px;
 	}
 
 	blockquote.alignright,
@@ -795,10 +780,9 @@
 		padding-left: 0;
 	}
 
-	.main-navigation .page_item_has_children > a,
 	.main-navigation .menu-item-has-children > a {
 		padding-right: 0;
-		padding-left: 32px;
+		padding-left: 38px;
 	}
 
 	blockquote.alignright,
Index: src/wp-content/themes/twentyfifteen/style.css
===================================================================
--- src/wp-content/themes/twentyfifteen/style.css	(revision 31095)
+++ src/wp-content/themes/twentyfifteen/style.css	(working copy)
@@ -681,9 +681,8 @@
 	position: relative;
 }
 
-.main-navigation .current_page_item > a,
 .main-navigation .current-menu-item > a,
-.main-navigation .current_page_ancestor > a {
+.main-navigation .current-menu-ancestor > a {
 	font-weight: 700;
 }
 
@@ -692,7 +691,6 @@
 	border-top: 0;
 }
 
-.main-navigation .page_item_has_children > a,
 .main-navigation .menu-item-has-children > a {
 	padding-right: 48px;
 }
@@ -2958,11 +2956,6 @@
 		margin-left: 1em;
 	}
 
-	.main-navigation .page_item_has_children > a,
-	.main-navigation .main-navigation .menu-item-has-children > a {
-		padding-right: 54px;
-	}
-
 	.main-navigation .menu-item-description {
 		font-size: 14px;
 		font-size: 1.4rem;
@@ -3584,11 +3577,6 @@
 		padding: 0.75em 0;
 	}
 
-	.main-navigation .page_item_has_children > a,
-	.main-navigation .main-navigation .menu-item-has-children > a {
-		padding-right: 53px;
-	}
-
 	.main-navigation .menu-item-description {
 		font-size: 16px;
 		font-size: 1.6rem;
@@ -4184,9 +4172,8 @@
 		padding: 0.5em 0;
 	}
 
-	.main-navigation .page_item_has_children > a,
 	.main-navigation .menu-item-has-children > a {
-		padding-right: 35px;
+		padding-right: 30px;
 	}
 
 	.main-navigation .menu-item-description {
@@ -4844,9 +4831,8 @@
 		padding: 0.4643em 0;
 	}
 
-	.main-navigation .page_item_has_children > a,
 	.main-navigation .menu-item-has-children > a {
-		padding-right: 33px;
+		padding-right: 34px;
 	}
 
 	.main-navigation .menu-item-description {
@@ -5383,9 +5369,8 @@
 		padding: 0.5em 0;
 	}
 
-	.main-navigation .page_item_has_children > a,
 	.main-navigation .menu-item-has-children > a {
-		padding-right: 32px;
+		padding-right: 38px;
 	}
 
 	.main-navigation .menu-item-description {