Index: src/wp-admin/css/wp-admin.css
===================================================================
--- src/wp-admin/css/wp-admin.css	(revision 26481)
+++ src/wp-admin/css/wp-admin.css	(working copy)
@@ -6791,89 +6791,22 @@
 	width: 25em;
 }
 
-.picker-dropdown {
-	background: #fcfcfc;
-	border: 1px solid #ddd;
-	margin-right: 12%;
-	max-width: 270px;
-	position: relative;
-	width: auto;
+.scheme-list {
+	
 }
 
-.picker-dropdown.dropdown-current {
-	padding: 20px;
-	margin-bottom: 15px;
-	cursor: pointer;
-}
-
-.picker-dropdown.dropdown-container {
-	display: none;
-	position: absolute;
-	width: 340px;
-	border-top: none;
-	-webkit-box-shadow: 0 3px 5px rgba(0, 0, 0, 0.2);
-	box-shadow: 0 3px 5px rgba(0, 0, 0, 0.2);
-	z-index: 1;
-}
-
-.picker-expanded .picker-dropdown.dropdown-container {
-	display: block;
-}
-
-.picker-dropdown.dropdown-container:before,
-.picker-dropdown.dropdown-container:after {
-	content: "\0020";
-	display: block;
-	position: absolute;
-	top: -10px;
-	left: 150px;
-	z-index: 2;
-	width: 0;
-	height: 0;
-	overflow: hidden;
-	border: solid 11px transparent;
-	border-top: 0;
-	border-bottom-color: #fefefe;
-}
-
-.picker-dropdown.dropdown-container:before {
-	top: -11px;
-	z-index: 1;
-	border-bottom-color: #ddd;
-}
-
-.picker-dropdown-arrow {
-	position: absolute;
-	top: -1px;
-	right: -42px;
-	display: block;
-	width: 40px;
-	height: 100%;
-	background: white;
-	text-align: center;
-	border: 1px solid #ddd;
-	border-left-width: 0;
-	cursor: pointer;
-}
-
-.picker-dropdown-arrow:before {
-	font: 20px/91px dashicons;
-	content: '\f140';
-}
-
-.picker-expanded .picker-dropdown-arrow:before {
-	content: '\f142';
-}
-
 .color-option {
+	float: left;
 	display: block;
+	width: 33%;
 	padding: 20px;
-	border-top: 1px solid #ddd;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
 }
 
 .color-option:hover,
 .color-option.selected {
-	background: #f2f8fa;
+	background: #ddd;
 }
 
 .color-palette {
@@ -6891,20 +6824,6 @@
 	cursor: pointer;
 }
 
-.no-js .dropdown-current {
-	display: none;
-}
-
-.no-js .dropdown-container {
-	display: block;
-	position: static;
-}
-
-.no-js .dropdown-container:before,
-.no-js .dropdown-container:after {
-	display: none;
-}
-
 /*------------------------------------------------------------------------------
   19.0 - Tools
 ------------------------------------------------------------------------------*/
@@ -12365,4 +12284,9 @@
 	div#post-body.metabox-holder.columns-1 {
 		overflow-x: hidden;
 	}
+
+	/* Color Picker Options */
+	.color-option {
+		width: 50%;
+	}
 }
Index: src/wp-admin/includes/misc.php
===================================================================
--- src/wp-admin/includes/misc.php	(revision 26481)
+++ src/wp-admin/includes/misc.php	(working copy)
@@ -573,23 +573,9 @@
 	$color_info = $_wp_admin_css_colors[ $current_color ];
 ?>
 
-	<fieldset id="color-picker">
+	<fieldset id="color-picker" class="scheme-list">
 		<legend class="screen-reader-text"><span><?php _e( 'Admin Color Scheme' ); ?></span></legend>
 
-		<div class="picker-dropdown dropdown-current">
-			<div class="picker-dropdown-arrow"></div>
-			<label for="admin_color_<?php echo esc_attr( $current_color ); ?>"><?php echo esc_html( $color_info->name ); ?></label>
-			<table class="color-palette">
-				<tr>
-				<?php foreach ( $color_info->colors as $html_color ): ?>
-					<td style="background-color: <?php echo esc_attr( $html_color ); ?>" title="<?php echo esc_attr( $current_color ); ?>">&nbsp;</td>
-				<?php endforeach; ?>
-				</tr>
-			</table>
-		</div>
-
-		<div class="picker-dropdown dropdown-container">
-
 		<?php foreach ( $_wp_admin_css_colors as $color => $color_info ) : ?>
 
 			<div class="color-option <?php echo ( $color == $current_color ) ? 'selected' : ''; ?>">
@@ -608,8 +594,6 @@
 
 		<?php endforeach; ?>
 
-		</div>
-
 	</fieldset>
 
 <?php
Index: src/wp-admin/js/user-profile.js
===================================================================
--- src/wp-admin/js/user-profile.js	(revision 26481)
+++ src/wp-admin/js/user-profile.js	(working copy)
@@ -82,11 +82,6 @@
 		user_id = $( 'input#user_id' ).val();
 		current_user_id = $( 'input[name="checkuser_id"]' ).val();
 
-		// dropdown toggle
-		$colorpicker.on( 'click', '.dropdown-current', function() {
-			$colorpicker.toggleClass( 'picker-expanded' );
-		});
-
 		$colorpicker.on( 'click', '.color-option', function() {
 
 			var color_scheme = $( this ).children( 'input[name="admin_color"]' ).val();
@@ -99,7 +94,6 @@
 			// update current
 			$colorpicker.find( '.dropdown-current label' ).html( $( this ).children( 'label' ).html() );
 			$colorpicker.find( '.dropdown-current table' ).html( $( this ).children( 'table' ).html() );
-			$colorpicker.toggleClass( 'picker-expanded' );
 
 			// preview/save color scheme
 			if ( user_id === current_user_id ) {