diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
index f7f5e7a522..d06bebedbd 100644
--- a/src/wp-admin/css/common.css
+++ b/src/wp-admin/css/common.css
@@ -2046,7 +2046,11 @@ html.wp-toolbar {
 	float: right;
 	width: 36px;
 	height: 36px;
+	margin: 0;
 	padding: 0;
+	border: 0;
+	background: none;
+	cursor: pointer;
 }
 
 .js .postbox .handlediv {
diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css
index 18c28f96ce..df6e49feac 100644
--- a/src/wp-admin/css/customize-controls.css
+++ b/src/wp-admin/css/customize-controls.css
@@ -1462,24 +1462,11 @@ body.cheatin p {
 
 /* Reordering */
 .reorder-toggle {
-	color: #0073aa;
 	float: right;
 	padding: 5px 8px;
 	text-decoration: none;
 	cursor: pointer;
 	outline: none;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-}
-
-.reorder-toggle:hover {
-	color: #00a0d2;
-}
-
-.reorder-toggle:focus {
-	outline: 1px dotted;
 }
 
 .reorder,
@@ -1491,13 +1478,6 @@ body.cheatin p {
 .reorder-done,
 .reordering .reorder {
 	display: none;
-	color: #0073aa;
-}
-
-.reorder-toggle:hover .reorder-done,
-.reorder-toggle:active .reorder-done,
-.reorder-toggle:focus .reorder-done {
-	color: #00a0d2;
 }
 
 .widget-reorder-nav span,
diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php
index 0da0b0d9bf..3c79d43b37 100644
--- a/src/wp-admin/includes/template.php
+++ b/src/wp-admin/includes/template.php
@@ -1038,7 +1038,7 @@ function do_meta_boxes( $screen, $context, $object ) {
 							unset( $box[ 'args' ][ '__widget_basename' ] );
 						}
 
-						echo '<button type="button" class="handlediv button-link" aria-expanded="true">';
+						echo '<button type="button" class="handlediv" aria-expanded="true">';
 						echo '<span class="screen-reader-text">' . sprintf( __( 'Toggle panel: %s' ), $widget_title ) . '</span>';
 						echo '<span class="toggle-indicator" aria-hidden="true"></span>';
 						echo '</button>';
diff --git a/src/wp-includes/css/buttons.css b/src/wp-includes/css/buttons.css
index b5971b4503..1a614cb9ee 100644
--- a/src/wp-includes/css/buttons.css
+++ b/src/wp-includes/css/buttons.css
@@ -209,6 +209,7 @@ TABLE OF CONTENTS:
 	background: none;
 	outline: none;
 	cursor: pointer;
+	text-align: left;
 	/* Mimics the default link style in common.css */
 	color: #0073aa;
 	text-decoration: underline;