Index: wp-admin/js/post-formats.js
===================================================================
--- wp-admin/js/post-formats.js	(revision 23740)
+++ wp-admin/js/post-formats.js	(working copy)
@@ -1,19 +1,27 @@
 window.wp = window.wp || {};
 
 (function($){
-	var imageFrame;
+	var imageFrame,
+		postFormatSelection = $('.post-format-selection');
 
+	// Post formats dropdown
+	postFormatSelection.on('focusin mouseenter', function () {
+		$(this).addClass('open');
+	}).on('focusout mouseleave', function () {
+		$(this).removeClass('open');
+	});
+
 	// Post formats selection
-	$('.post-format-select a').on( 'click.post-format', function(e) {
+	postFormatSelection.find('a').on( 'click', function(e){
 		var $this = $(this), editor, body,
 			format = $this.data('wp-format'), container = $('#post-body-content');
 
-		$('.post-format-select a.nav-tab-active').removeClass('nav-tab-active');
-		$this.addClass('nav-tab-active').blur();
+		postFormatSelection.removeClass('open').find('.selected').removeClass(postFormats.currentPostFormat).addClass(format);
 		$('#post_format').val(format);
 
 		container.get(0).className = container.get(0).className.replace( /\bwp-format-[^ ]+/, '' );
 		container.addClass('wp-format-' + format);
+		$('#title').focus();
 
 		if ( typeof tinymce != 'undefined' ) {
 			editor = tinymce.get('content');
@@ -25,7 +33,13 @@
 			}
 		}
 
+		postFormats.currentPostFormat = format;
+
 		e.preventDefault();
+	}).on('focusin mouseenter', function () {
+		$(this).parent('.post-format-options').addClass( $(this).data('wp-format') );
+	}).on('focusout mouseleave', function () {
+		$(this).parent('.post-format-options').removeClass( $(this).data('wp-format') );
 	});
 
 	// Image selection
Index: wp-admin/edit-form-advanced.php
===================================================================
--- wp-admin/edit-form-advanced.php	(revision 23740)
+++ wp-admin/edit-form-advanced.php	(working copy)
@@ -138,6 +138,25 @@
 	$format_class = " class='wp-format-{$post_format}'";
 }
 
+if ( post_type_supports( $post_type, 'post-formats' ) ) {
+	$all_post_formats = get_post_format_strings();
+	$post_format_options = '';
+
+	foreach ( $all_post_formats as $slug => $label ) {
+		$class = '';
+		if ( $post_format == $slug ) {
+			$class = 'active';
+			$active_post_type_slug = $slug;
+			$active_post_type_label = $label;
+		}
+
+		$post_format_options .= '<a class="' . $class . '" href="?format=' . $slug . '" data-wp-format="' . $slug . '" title="' . sprintf( __( '%s format' ), $slug ) . '"><span class="' . $slug . '"></span>' . $label . '</a>';
+	}
+}
+
+$current_post_format = array( 'currentPostFormat' => esc_html( $active_post_type_slug ) );
+wp_localize_script( 'post', 'postFormats', $current_post_format );
+
 if ( post_type_supports($post_type, 'page-attributes') )
 	add_meta_box('pageparentdiv', 'page' == $post_type ? __('Page Attributes') : __('Attributes'), 'page_attributes_meta_box', null, 'side', 'core');
 
@@ -294,7 +313,21 @@
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
+
+<?php if ( ! empty( $post_format_options ) ) : ?>
+<div class="post-format-selection" tabindex="0" title="<?php _e( 'Select a post format' ); ?>">
+	<div class="current-post-format">
+		<div class="selected <?php echo esc_attr( $active_post_type_slug ); ?>">
+			<?php echo esc_html( $active_post_type_label ); ?>
+		</div>
+	</div>
+	<div class="post-format-options">
+		<div class="arrow"></div>
+		<?php echo $post_format_options; ?>
+	</div>
+</div>
+<?php endif; ?>
+
 <h2><?php
 echo esc_html( $title );
 if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) )
@@ -330,26 +363,6 @@
 ?>
 
 <div id="poststuff">
-
-<?php
-if ( post_type_supports( $post_type, 'post-formats' ) ) {
-	$all_post_formats = get_post_format_strings();
-
-	echo '<h2 class="nav-tab-wrapper post-format-select">';
-
-	foreach ( $all_post_formats as $slug => $label ) {
-		if ( $post_format == $slug )
-			$class = 'nav-tab nav-tab-active';
-		else
-			$class = 'nav-tab';
-
-		echo '<a class="' . $class . '" href="?format=' . $slug . '" data-wp-format="' . $slug . '">' . $label . '</a>';
-	}
-
-	echo '</h2>';
-}
-?>
-
 <div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
 <div id="post-body-content"<?php echo $format_class; ?>>
 
Index: wp-admin/css/wp-admin-rtl.css
===================================================================
--- wp-admin/css/wp-admin-rtl.css	(revision 23740)
+++ wp-admin/css/wp-admin-rtl.css	(working copy)
@@ -23,6 +23,7 @@
 	11.1 - Custom Fields
 	11.2 - Post Revisions
 	11.3 - Featured Images
+	11.4 - Post Format Selection
 12.0 - Categories
 13.0 - Tags
 14.0 - Media Screen
@@ -964,6 +965,48 @@
 }
 
 /*------------------------------------------------------------------------------
+  11.4 - Post format selection
+------------------------------------------------------------------------------*/
+
+.post-format-selection {
+	float: right;
+}
+
+.current-post-format {
+	background: transparent url(../images/arrows.png) no-repeat 4px 11px;
+}
+
+.post-format-selection.open .current-post-format {
+	background: url(../images/arrows.png) no-repeat 4px -25px;
+}
+
+.post-format-options {
+	left: auto;
+	right: 0;
+}
+
+.post-format-options a {
+	padding: 9px 32px 8px 7px;
+}
+
+.post-format-options .arrow {
+	left: auto;
+	right: 14px;
+	margin-left: 0;
+	margin-right: -7px;
+}
+
+.post-format-options .arrow:after {
+	margin-left: 0;
+	margin-right: -7px;
+}
+
+.post-format-selection .post-format-options a span {
+	left: auto;
+	right: 4px;
+}
+
+/*------------------------------------------------------------------------------
   12.0 - Categories
 ------------------------------------------------------------------------------*/
 
Index: wp-admin/css/wp-admin.css
===================================================================
--- wp-admin/css/wp-admin.css	(revision 23740)
+++ wp-admin/css/wp-admin.css	(working copy)
@@ -24,6 +24,7 @@
 	11.1 - Custom Fields
 	11.2 - Post Revisions
 	11.3 - Featured Images
+	11.4 - Post Format Selection
 12.0 - Categories
 13.0 - Tags
 14.0 - Media Screen
@@ -3912,6 +3913,204 @@
 }
 
 /*------------------------------------------------------------------------------
+  11.4 - Post format selection
+------------------------------------------------------------------------------*/
+
+.post-format-selection {
+	width: 55px;
+	height: 40px;
+	margin-top: 4px;
+	padding-bottom: 5px;
+	position: relative;
+	float: left;
+}
+
+.post-format-selection.open .post-format-options {
+	display: block;
+}
+
+.post-format-selection .selected {
+	opacity: 0.6;
+	width: 36px;
+	height: 36px;
+	text-indent: -10000px;
+}
+
+.current-post-format {
+	background: transparent url(../images/arrows.png) no-repeat 34px 11px;
+}
+
+.post-format-selection.open .current-post-format {
+	background: url(../images/arrows.png) no-repeat 34px -25px;
+}
+
+.current-post-format .standard {
+	background: url(../images/post-formats32.png) no-repeat -3px -2px;
+}
+
+.current-post-format .image {
+	background: url(../images/post-formats32.png) no-repeat  -43px -2px;
+}
+
+.current-post-format .gallery {
+	background: url(../images/post-formats32.png) no-repeat -83px -2px;
+}
+
+.current-post-format .audio {
+	background: url(../images/post-formats32.png) no-repeat -123px -2px;
+}
+
+.current-post-format .video {
+	background: url(../images/post-formats32.png) no-repeat -163px -2px;
+}
+
+.current-post-format .chat {
+	background: url(../images/post-formats32.png) no-repeat -202px -2px;
+}
+
+.current-post-format .status {
+	background: url(../images/post-formats32.png) no-repeat -242px -2px;
+}
+
+.current-post-format .aside {
+	background: url(../images/post-formats32.png) no-repeat -282px -2px;
+}
+
+.current-post-format .quote {
+	background: url(../images/post-formats32.png) no-repeat -322px -2px;
+}
+
+.current-post-format .link {
+	background: url(../images/post-formats32.png) no-repeat -362px -2px;
+}
+
+.post-format-options {
+	background: #fff;
+	border: 1px solid #ccc;
+	display: none;
+	position: absolute;
+	top: 45px;
+	left: 0;
+	width: 150px;
+	z-index: 100000;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	box-shadow: 2px 2px 3px rgba(0,0,0,0.1);
+}
+
+.post-format-options a {
+	border-bottom: 1px solid #eee;
+	display: block;
+	padding: 9px 7px 8px 32px;
+	position: relative;
+	text-decoration: none;
+}
+
+.post-format-options a:last-child {
+	border-bottom: 1px solid #ccc;
+	-webkit-border-bottom-left-radius: 3px;
+	-webkit-border-bottom-right-radius: 3px;
+	border-bottom-left-radius: 3px;
+	border-bottom-right-radius: 3px;
+}
+
+.post-format-options a:focus,
+.post-format-options a:hover {
+	background: #eee;
+	border-bottom: 1px solid #ddd;
+	color: #222;
+	outline: none;
+}
+
+.post-format-options .arrow,
+.post-format-options .arrow:after {
+	position: absolute;
+	display: block;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+}
+
+.post-format-options .arrow {
+	border-width: 7px;
+	top: -7px;
+	left: 14px;
+	margin-left: -7px;
+	border-bottom-color: #ccc;
+	border-bottom-color: rgba(0, 0, 0, 0.25);
+	border-top-width: 0;
+}
+
+.post-format-options .arrow:after {
+	border-width: 6px;
+	content: "";
+	top: 1px;
+	margin-left: -6px;
+	border-bottom-color: #fff;
+	border-top-width: 0;
+}
+
+.post-format-options.standard .arrow:after {
+	border-bottom-color: #eee;
+}
+
+.post-format-options .standard {
+	background: url(../images/post-formats.png) no-repeat -2px -2px;
+}
+
+.post-format-options .image {
+	background: url(../images/post-formats.png) no-repeat -33px -2px;
+}
+
+.post-format-options .gallery {
+	background: url(../images/post-formats.png) no-repeat -66px -2px;
+}
+
+.post-format-options .audio {
+	background: url(../images/post-formats.png) no-repeat -98px -2px;
+}
+
+.post-format-options .video {
+	background: url(../images/post-formats.png) no-repeat -130px -2px;
+}
+
+.post-format-options .chat {
+	background: url(../images/post-formats.png) no-repeat -162px -2px;
+}
+
+.post-format-options .status {
+	background: url(../images/post-formats.png) no-repeat -194px -2px;
+}
+
+.post-format-options .aside {
+	background: url(../images/post-formats.png) no-repeat -226px -2px;
+}
+
+.post-format-options .quote {
+	background: url(../images/post-formats.png) no-repeat -258px -2px;
+}
+
+.post-format-options .link {
+	background: url(../images/post-formats.png) no-repeat -290px -2px;
+}
+
+.post-format-selection .post-format-options a span {
+	background-position-y: 0;
+	height: 24px;
+	left: 0;
+	opacity: 0.5;
+	position: absolute;
+	top: 0;
+	width: 24px;
+}
+
+.post-format-selection .post-format-options a:focus span,
+.post-format-selection .post-format-options a:hover span {
+	opacity: 1;
+}
+
+/*------------------------------------------------------------------------------
   12.0 - Categories
 ------------------------------------------------------------------------------*/