diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index bebc63876d..c55b8aba7b 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -2064,7 +2064,7 @@ function translate_smiley( $matches ) {
 	 */
 	$src_url = apply_filters( 'smilies_src', includes_url( "images/smilies/$img" ), $img, site_url() );
 
-	return sprintf( '<img src="%s" alt="%s" class="wp-smiley" />', esc_url( $src_url ), esc_attr( $smiley ) );
+	return sprintf( '<img src="%s" alt="%s" class="wp-smiley" style="height: 1em;" />', esc_url( $src_url ), esc_attr( $smiley ) );
 }
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 36179d20cf..bb041c6016 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta1-31780';
+$wp_version = '4.2-beta1-31781';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.