diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index c7df2df14d..16c0ff7ef5 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -70,47 +70,50 @@ function post_submit_meta_box($post) {
 ?>
 <div class="submitbox" id="submitpost">
 
-<!--<div class="inside-submitbox">-->
-
 <div id="minor-publishing">
 <div id="misc-publishing-actions">
+
+<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
+<div style="display:none;">
+<input type="submit" name="save" value="<?php echo attribute_escape( __('Save') ); ?>" />
+</div>
+
 <?php if ( $can_publish && current_user_can( 'edit_others_posts' ) ) { ?>
 	<div class="misc-pub-section" id="sticky-checkbox"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked(is_sticky($post->ID), true); ?> tabindex="4" /> <label for="sticky" class="selectit"><?php _e('Stick to front page') ?></label></div>
 <?php } ?>
 
 <div class="misc-pub-section" id="visibility">
-<?php _e('Visibility:'); ?> <?php _e('Public'); // TODO: dropdown ?>
+<?php _e('Visibility:'); ?> <b><?php _e('Public'); // TODO: dropdown ?></b>
 </div>
 
 <?php
+$datef = _c( 'M j, Y \a\t G:i|Publish box date format');
 if ( 0 != $post->ID ) {
 	if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
-		$stamp = __('Scheduled for: %1$s at %2$s');
+		$stamp = __('Scheduled for:<br />%1$s');
 	} else if ( 'publish' == $post->post_status ) { // already published
-		$stamp = __('Published on: %1$s at %2$s');
+		$stamp = __('Published on:<br />%1$s');
 	} else if ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified
 		$stamp = __('Publish immediately');
 	} else { // draft, 1 or more saves, date specified
-		$stamp = __('Publish on: %1$s at %2$s');
+		$stamp = __('Publish on:<br />%1$s');
 	}
-	$date = mysql2date(get_option('date_format'), $post->post_date);
-	$time = mysql2date(get_option('time_format'), $post->post_date);
+	$date = date_i18n( $datef, strtotime( $post->post_date ) );
 } else { // draft (no saves, and thus no date specified)
 	$stamp = __('Publish immediately');
-	$date = mysql2date(get_option('date_format'), current_time('mysql'));
-	$time = mysql2date(get_option('time_format'), current_time('mysql'));
+	$date = date_i18n( $datef, strtotime( current_time('mysql') ) );
 }
 ?>
 <?php if ( $can_publish ) : // Contributors don't get to choose the date of publish ?>
 <div class="misc-pub-section curtime">
-	<span id="timestamp"><?php printf($stamp, $date, $time); ?></span>
+	<span id="timestamp"><?php printf($stamp, $date); ?></span>
 	&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a>
 	<div id="timestampdiv" class="hide-if-js"><?php touch_time(($action == 'edit'),1,4); ?></div>
 </div>
 <?php endif; ?>
 
 <div class="misc-pub-section misc-pub-section-last"><label for="post_status"><?php _e('Status:') ?></label>
-<strong><span id="post-status-display">
+<b><span id="post-status-display">
 <?php
 switch ( $post->post_status ) {
 	case 'publish':
@@ -128,7 +131,7 @@ switch ( $post->post_status ) {
 		break;
 }
 ?>
-</span></strong>
+</span></b>
 <?php if ( 'publish' == $post->post_status || 'private' == $post->post_status ) { ?>
 <a href="#post_status" class="edit-post-status hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a>
 
@@ -167,12 +170,10 @@ if ( $can_publish OR ( $post->post_status == 'publish' AND current_user_can('edi
 </div>
 
 <div id="minor-publishing-actions">
-<?php if ( 'publish' == $post->post_status || 'private' == $post->post_status )
-	$savebtn = attribute_escape( __('Update Post') );
-else
-	$savebtn = attribute_escape( __('Save Draft') );
-?>
-<input type="submit" name="save" id="save-post" value="<?php echo $savebtn; ?>" tabindex="4" class="button button-highlighted" />
+
+<?php if ( 'publish' != $post->post_status && 'private' != $post->post_status )  { ?>
+<input type="submit" name="save" id="save-post" value="<?php echo attribute_escape( __('Save Draft') ); ?>" tabindex="4" class="button button-highlighted" />
+<?php } ?>
 
 <?php if ( 'publish' == $post->post_status ) { ?>
 <a class="preview button" href="<?php echo clean_url(get_permalink($post->ID)); ?>" target="_blank" tabindex="4"><?php _e('View Post'); ?></a>
@@ -182,7 +183,6 @@ else
 </div>
 <div class="clear"></div>
 </div>
-<!--</div>-->
 
 <div id="major-publishing-actions">
 <?php do_action('post_submitbox_start'); ?>
@@ -201,12 +201,13 @@ if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post->
 <?php else : ?>
 	<input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" />
 <?php endif; ?>
+<?php } else { ?>
+	<input name="save" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Update Post') ?>" />
 <?php } ?>
 </div>
-</div>
-
 <div class="clear"></div>
 </div>
+</div>
 
 <?php
 }
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 3a8b6d57fa..56820c0c4b 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -208,13 +208,16 @@ table#availablethemes td.bottom {
 }
 
 #misc-publishing-actions {
-	width: 69%;
 	float: left;
 	border-right: 1px solid #ddd;
 }
 
+#side-sortables #misc-publishing-actions {
+	max-width: 170px;
+}
+
 .misc-pub-section {
-	padding: 6px 0;
+	padding: 6px;
 	border-bottom: 1px solid #ddd;
 }
 
@@ -223,42 +226,52 @@ table#availablethemes td.bottom {
 }
 
 #minor-publishing-actions {
-	width: 30%;
+	padding: 6px 6px 0 0;
 	float: right;
 	text-align: right;
 }
 
+#save-post {
+	float: right;
+	margin-bottom: 10px;
+}
+
 .preview {
 	float: right;
+	clear: right;
 	padding: 2px 8px !important;
-	top: 10px;
-	position: relative;
 }
 
 #minor-publishing {
+	margin-top: -10px;
 	border-bottom: 1px solid #ddd;
 }
 
 #major-publishing-actions {
 	background: #eaf2fa;
-	padding-top: 8px;
+	padding: 6px;
 	clear: both;
 }
 
+#minor-publishing-actions input,
+#major-publishing-actions input,
+#minor-publishing-actions .preview {
+	min-width: 80px;
+	text-align: center;
+}
+
 #delete-action {
 	line-height: 25px;
 	vertical-align: middle;
 	text-align: left;
 	float: left;
 	width: 30%;
-	background: #eaf2fa;
 }
 
 #publishing-action {
 	text-align: right;
 	float: right;
 	width: 70%;
-	background: #eaf2fa;
 }
 
 .side-info {
@@ -299,6 +312,9 @@ table#availablethemes td.bottom {
 	-webkit-border-radius: 11px;
 	border-radius: 11px;
 	-moz-box-sizing: content-box;
+	-webkit-box-sizing: content-box;
+	-khtml-box-sizing: content-box;
+	box-sizing: content-box;
 }
 
 a.button {
@@ -322,10 +338,6 @@ a.button {
 	width: 150px;
 }
 
-#publish {
-	min-width: 100px;
-}
-
 #wpcontent select {
 	font: 12px/20px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
 	padding: 2px;
@@ -399,6 +411,7 @@ textarea.all-options, input.all-options {
 	outline: none;
 	-moz-box-sizing: border-box;
 	-webkit-box-sizing: border-box;
+	-khtml-box-sizing: border-box;
 	box-sizing: border-box;
 }
 
@@ -1501,6 +1514,10 @@ table.form-table td .updated {
 	margin: 0 6px 6px;
 }
 
+#poststuff #submitdiv .inside {
+	margin: 0;
+}
+
 #titlediv, #poststuff .postarea {
 	margin-bottom: 20px;
 }