Index: src/wp-includes/css/customize-preview.css
===================================================================
--- src/wp-includes/css/customize-preview.css	(revision 39144)
+++ src/wp-includes/css/customize-preview.css	(working copy)
@@ -31,8 +31,8 @@
 
 .widget .customize-partial-edit-shortcut button:active,
 .customize-partial-edit-shortcut button:active {
-	padding: 0;
-	border: 0;
+	padding: 3;
+	border: 1px solid #0085ba;
 }
 
 /* Styles for the actual shortcut */
@@ -39,7 +39,8 @@
 .widget .customize-partial-edit-shortcut button,
 .customize-partial-edit-shortcut button {
 	position: absolute;
-	left: -36px;
+	left: -30px;
+	top: 2px;
 	color: #fff;
 	width: 30px;
 	height: 30px;
@@ -55,30 +56,9 @@
 	-webkit-box-shadow: 0 2px 1px rgba(46,68,83,0.15);
 	box-shadow: 0 2px 1px rgba(46,68,83,0.15);
 	text-align: center;
-	display: -webkit-box;
-	display: -webkit-flex;
-	display: -moz-box;
-	display: -ms-flexbox;
-	display: flex;
-	-webkit-box-orient: horizontal;
-	-webkit-box-direction: normal;
-	-webkit-flex-direction: row;
-	-moz-box-orient: horizontal;
-	-moz-box-direction: normal;
-	-ms-flex-direction: row;
-	flex-direction: row;
-	-webkit-box-pack: center;
-	-webkit-justify-content: center;
-	-moz-box-pack: center;
-	-ms-flex-pack: center;
-	justify-content: center;
-	-webkit-box-align: center;
-	-webkit-align-items: center;
-	-moz-box-align: center;
-	-ms-flex-align: center;
-	align-items: center;
 	cursor: pointer;
-	padding: 0;
+	box-sizing: border-box; 
+	padding: 3px;
 	-webkit-animation-fill-mode: both;
 	animation-fill-mode: both;
 	-webkit-animation-duration: .4s;
@@ -91,6 +71,27 @@
 	             -1px 0 1px #006799;
 }
 
+#site-navigation .customize-partial-edit-shortcut button { 
+	top: 9px;
+	left: -13px;  			
+ }
+
+#content .customize-partial-edit-shortcut button {
+	left: 15px;
+	top: 92px;
+}
+
+.footer-widget-1 .customize-partial-edit-shortcut button,
+.footer-widget-2 .customize-partial-edit-shortcut button {
+	top: 10px;
+	left: -30px;
+}
+
+.menu-social-container .customize-partial-edit-shortcut button {
+ 	top: 6px;
+ 	left: -30px;
+ }
+
 .customize-partial-edit-shortcut button svg {
 	fill: #fff;
 	min-width: 20px;
@@ -123,7 +124,8 @@
 }
 
 .customize-partial-edit-shortcut-left-margin.customize-partial-edit-shortcut button {
-	left: 0;
+	left: 2px;
+	top: 2px;
 }
 
 @-webkit-keyframes customize-partial-edit-shortcut-bounce-appear {
@@ -263,7 +265,59 @@
 }
 
 @media screen and (max-width:800px) {
+	.widget .customize-partial-edit-shortcut button, 
 	.customize-partial-edit-shortcut button {
-		left: -18px; /* Assume there will be less of a margin available on smaller screens */
+		left: -36px; /* Assume there will be less of a margin available on smaller screens */
 	}
+
+	#site-navigation .customize-partial-edit-shortcut button { 
+ 		top: -40px;
+ 		left: 292px;  			
+ 	}
+
+ 	#content .customize-partial-edit-shortcut { 
+ 		top: -33px;
+ 		left: -14px; 
+ 			
+ 	}
+
+ 	.footer-widget-1 .customize-partial-edit-shortcut button,
+ 	.footer-widget-2 .customize-partial-edit-shortcut button { 
+ 		top: 14px;
+ 		left: -34px;
+ 	}
+
+ 	.menu-social-container .customize-partial-edit-shortcut button {
+ 		top: 6px;
+ 		left: -34px;
+ 	}
 }
+
+@media screen and (max-width:320px) { 
+ 	.widget .customize-partial-edit-shortcut button, 
+ 	.customize-partial-edit-shortcut button { 
+ 			left: -29px; /* Assume there will be less of a margin available on smaller screens */ 
+ 	} 
+
+ 	#site-navigation .customize-partial-edit-shortcut button { 
+ 		top: -40px;
+ 		left: 92px;  			
+ 	}
+
+ 	#content .customize-partial-edit-shortcut { 
+ 		top: -70px;
+ 		left: -14px; 
+ 			
+ 	}
+
+ 	.footer-widget-1 .customize-partial-edit-shortcut button,
+ 	.footer-widget-2 .customize-partial-edit-shortcut button { 
+ 		top: 14px;
+ 		left: -30px;			
+ 	} 
+ 	.menu-social-container .customize-partial-edit-shortcut button {
+ 		top: 6px;
+ 		left: -30px;
+ 	}
+} 
+} 
\ No newline at end of file
