diff --git a/wp-content/themes/twentytwelve/content-status.php b/wp-content/themes/twentytwelve/content-status.php
index 2ba366c982..110c6c17a2 100644
--- a/wp-content/themes/twentytwelve/content-status.php
+++ b/wp-content/themes/twentytwelve/content-status.php
@@ -9,14 +9,15 @@
 ?>
 
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+		<div class="entry-header">
+			<header>
+				<h1><?php the_author(); ?></h1>
+				<h2><a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a></h2>
+			</header>
+			<?php echo get_avatar( get_the_author_meta( 'ID' ), apply_filters( 'twentytwelve_status_avatar', '48' ) ); ?>
+		</div><!-- .entry-header -->
+
 		<div class="entry-content">
-			<div class="avatar">
-				<header>
-					<h1><?php the_author(); ?></h1>
-					<h2><a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a></h2>
-				</header>
-				<?php echo get_avatar( get_the_author_meta( 'ID' ), apply_filters( 'twentytwelve_status_avatar', '48' ) ); ?>
-			</div>
 			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?>
 		</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentytwelve/rtl.css b/wp-content/themes/twentytwelve/rtl.css
index a659c7e69f..3e9a7df1ba 100644
--- a/wp-content/themes/twentytwelve/rtl.css
+++ b/wp-content/themes/twentytwelve/rtl.css
@@ -93,7 +93,7 @@ article.format-link .entry-content {
 }
 
 /* Status posts */
-.format-status div.avatar img {
+.format-status .entry-header img {
 	float: right;
 	margin-left: 21px;
 	margin-left: 1.5rem;
diff --git a/wp-content/themes/twentytwelve/style.css b/wp-content/themes/twentytwelve/style.css
index 4718f1e593..4c7a4c997d 100644
--- a/wp-content/themes/twentytwelve/style.css
+++ b/wp-content/themes/twentytwelve/style.css
@@ -158,13 +158,16 @@ img {
 
 /* Clearing floats */
 .clear:after,
-.wrapper:after {
+.wrapper:after,
+.format-status .entry-header:after {
 	clear: both;
 }
 .clear:before,
 .clear:after,
 .wrapper:before,
-.wrapper:after {
+.wrapper:after,
+.format-status .entry-header:before,
+.format-status .entry-header:after {
 	display: table;
 	content: "";
 }
@@ -1027,34 +1030,34 @@ article.format-quote .entry-content blockquote {
 }
 
 /* Status posts */
-.format-status div.avatar {
+.format-status .entry-header {
 	margin-bottom: 24px;
 	margin-bottom: 1.714285714rem;
 }
-.format-status div.avatar header {
+.format-status .entry-header header {
 	display: inline-block;
 }
-.format-status div.avatar h1 {
+.format-status .entry-header h1 {
 	font-size: 15px;
 	font-size: 1.071428571rem;
 	font-weight: normal;
 	line-height: 1.6;
 	margin: 0;
 }
-.format-status div.avatar h2 {
+.format-status .entry-header h2 {
 	font-size: 12px;
 	font-size: 0.857142857rem;
 	font-weight: normal;
 	line-height: 2;
 	margin: 0;
 }
-.format-status div.avatar a {
+.format-status .entry-header header a {
 	color: #777;
 }
-.format-status div.avatar a:hover {
+.format-status .entry-header header a:hover {
 	color: #21759b;
 }
-.format-status div.avatar img {
+.format-status .entry-header img {
 	float: left;
 	margin-right: 21px;
 	margin-right: 1.5rem;