Index: wp-admin/includes/post.php
===================================================================
--- wp-admin/includes/post.php	(revision 23389)
+++ wp-admin/includes/post.php	(working copy)
@@ -193,12 +193,33 @@
 
 	// Post Formats
 	if ( isset( $post_data['post_format'] ) ) {
-		if ( current_theme_supports( 'post-formats', $post_data['post_format'] ) )
-			set_post_format( $post_ID, $post_data['post_format'] );
-		elseif ( '0' == $post_data['post_format'] )
-			set_post_format( $post_ID, false );
+		set_post_format( $post_ID, $post_data['post_format'] );
 	}
 
+	if ( isset( $post_data[ '_wp_format_quote' ] ) ) {
+		update_post_meta( $post_ID, '_wp_format_quote', addslashes( wp_kses_post( stripslashes( $post_data['_wp_format_quote'] ) ) ) );
+	}
+
+	if ( isset( $post_data[ '_wp_format_quote_source' ] ) ) {
+		update_post_meta( $post_ID, '_wp_format_quote_source', addslashes( wp_kses_post( stripslashes( $post_data['_wp_format_quote_source'] ) ) ) );
+	}
+
+	if ( isset( $post_data[ '_wp_format_url' ] ) ) {
+		update_post_meta( $post_ID, '_wp_format_url', addslashes( esc_url_raw( stripslashes( $post_data['_wp_format_url'] ) ) ) );
+	}
+
+	if ( isset( $post_data[ '_wp_format_image' ] ) ) {
+		update_post_meta( $post_ID, '_wp_format_image', addslashes( wp_kses_post( stripslashes( $post_data['_wp_format_image'] ) ) ) );
+	}
+
+	if ( isset( $post_data[ '_wp_format_gallery' ] ) ) {
+		update_post_meta( $post_ID, '_wp_format_gallery', addslashes( wp_kses_post( stripslashes( $post_data['_wp_format_gallery'] ) ) ) );
+	}
+
+	if ( isset( $post_data[ '_wp_format_media' ] ) ) {
+		update_post_meta( $post_ID, '_wp_format_media', addslashes( wp_kses_post( stripslashes( $post_data['_wp_format_media'] ) ) ) );
+	}
+
 	// Meta Stuff
 	if ( isset($post_data['meta']) && $post_data['meta'] ) {
 		foreach ( $post_data['meta'] as $key => $value ) {
Index: wp-admin/js/post.js
===================================================================
--- wp-admin/js/post.js	(revision 23389)
+++ wp-admin/js/post.js	(working copy)
@@ -791,4 +791,13 @@
 			});
 		});
 	}
+
+	// Post formats selection
+	$('.post-format-select a').on( 'click', function(e){
+		e.preventDefault();
+		var $this = $(this);
+		$('.post-format-select a.nav-tab-active').removeClass('nav-tab-active');
+		$this.addClass('nav-tab-active').blur();
+		$('#post_format').val($this.data('format'));
+	});
 });
Index: wp-admin/edit-form-advanced.php
===================================================================
--- wp-admin/edit-form-advanced.php	(revision 23389)
+++ wp-admin/edit-form-advanced.php	(working copy)
@@ -112,9 +112,6 @@
 	add_meta_box( 'submitdiv', __( 'Publish' ), 'post_submit_meta_box', null, 'side', 'core' );
 }
 
-if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post_type, 'post-formats' ) )
-	add_meta_box( 'formatdiv', _x( 'Format', 'post format' ), 'post_format_meta_box', null, 'side', 'core' );
-
 // all taxonomies
 foreach ( get_object_taxonomies( $post ) as $tax_name ) {
 	$taxonomy = get_taxonomy($tax_name);
@@ -323,6 +320,30 @@
 
 <div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
 <div id="post-body-content">
+
+<?php
+if ( post_type_supports( $post_type, 'post-formats' ) ) {
+	$post_format = get_post_format();
+	if ( ! $post_format )
+		$post_format = 'standard';
+
+	$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-format="' . $slug . '">' . $label . '</a>';
+	}
+
+	echo '</h2>';
+}
+?>
+
 <?php if ( post_type_supports($post_type, 'title') ) { ?>
 <div id="titlediv">
 <div id="titlewrap">
@@ -356,6 +377,49 @@
 
 do_action( 'edit_form_after_title' );
 
+// post format fields
+if ( post_type_supports( $post_type, 'post-formats' ) ) {
+	$format_quote = get_post_meta( $post_ID, '_wp_format_quote', true );
+	$format_quote_source = get_post_meta( $post_ID, '_wp_format_quote_source', true );
+	$format_url = get_post_meta( $post_ID, '_wp_format_url', true );
+	$format_image = get_post_meta( $post_ID, '_wp_format_image', true );
+	$format_gallery = get_post_meta( $post_ID, '_wp_format_gallery', true );
+	$format_media = get_post_meta( $post_ID, '_wp_format_media', true );
+?>
+<input type="hidden" name="post_format" id="post_format" value="<?php echo esc_attr( $post_format ); ?>" />
+
+<div class="wp_format_quote">
+	<label for="_wp_format_quote"><?php _e( 'Quote' ); ?>:</label>
+	<textarea name="_wp_format_quote" class="widefat"><?php echo esc_textarea( $format_quote ); ?></textarea>
+</div>
+
+<div class="wp_format_quote_source">
+	<label for="_wp_format_quote_source"><?php _e( 'Source' ); ?>:</label>
+	<input type="text" name="_wp_format_quote_source" value="<?php echo esc_attr( $format_quote_source ); ?>" class="widefat" />
+</div>
+
+<div class="wp_format_url">
+	<label for="_wp_format_url"><?php _e( 'URL' ); ?>:</label>
+	<input type="text" name="_wp_format_url" value="<?php echo esc_url( $format_url ); ?>" class="widefat" />
+</div>
+
+<div class="wp_format_image">
+	<label for="_wp_format_image"><?php _e( 'Image' ); ?>:</label>
+	<input type="text" name="_wp_format_image" value="<?php echo esc_attr( $format_image ); ?>" class="widefat" />
+</div>
+
+<div class="wp_format_gallery">
+	<label for="_wp_format_gallery"><?php _e( 'Gallery' ); ?>:</label>
+	<input type="text" name="_wp_format_gallery" value="<?php echo esc_attr( $format_gallery ); ?>" class="widefat" />
+</div>
+
+<div class="wp_format_media">
+	<label for="_wp_format_media"><?php _e( 'Media' ); ?>:</label>
+	<textarea name="_wp_format_media" class="widefat"><?php echo esc_textarea( $format_media ); ?></textarea>
+</div>
+<?php
+}
+
 if ( post_type_supports($post_type, 'editor') ) {
 ?>
 <div id="postdivrich" class="postarea">