diff --git a/src/wp-content/themes/twentyseventeen/style.css b/src/wp-content/themes/twentyseventeen/style.css
index df343acf4f..5aff5c02e0 100644
--- a/src/wp-content/themes/twentyseventeen/style.css
+++ b/src/wp-content/themes/twentyseventeen/style.css
@@ -2941,7 +2941,7 @@ object {
 }
 
 .highlight-front-sections.twentyseventeen-customizer.twentyseventeen-front-page .twentyseventeen-panel:after {
-	border: 2px dashed;
+	border: 2px dashed #0085ba; /* Matches visible edit shortcuts. */
 	bottom: 1em;
 	content: "";
 	display: block;
@@ -2949,7 +2949,11 @@ object {
 	position: absolute;
 	right: 1em;
 	top: 1em;
-	z-index: -1; /* Prevent :after from preventing interactions within the section */
+	z-index: 1;
+}
+
+.highlight-front-sections.twentyseventeen-customizer.twentyseventeen-front-page .twentyseventeen-panel .panel-content {
+	z-index: 2; /* Prevent :after from preventing interactions within the section */
 }
 
 /* Used for placeholder text */
@@ -2969,21 +2973,6 @@ object {
 	border: none;
 }
 
-.highlight-front-sections.twentyseventeen-customizer.twentyseventeen-front-page .twentyseventeen-panel:nth-of-type(2):after {
-	border-color: #b569a2;
-	color: #b569a2;
-}
-
-.highlight-front-sections.twentyseventeen-customizer.twentyseventeen-front-page .twentyseventeen-panel:nth-of-type(3):after {
-	border-color: #8f68bd;
-	color: #8f68bd;
-}
-
-.highlight-front-sections.twentyseventeen-customizer.twentyseventeen-front-page .twentyseventeen-panel:nth-of-type(4):after {
-	border-color: #575ebd;
-	color: #575ebd;
-}
-
 .twentyseventeen-front-page.twentyseventeen-customizer #primary article.panel-placeholder {
 	border: 0;
 }