diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index 388922cb90..f4d262fd9d 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -2971,10 +2971,10 @@ function smilies_init() {
 		    ':eek:' => "\xf0\x9f\x98\xaf",
 		    ':lol:' => "\xf0\x9f\x98\x84",
 		    ':mad:' => "\xf0\x9f\x98\xa1",
-		    ':sad:' => "\xf0\x9f\x98\xa6",
+		    ':sad:' => 'frownie.png',
 		      '8-)' => "\xf0\x9f\x98\x8e",
 		      '8-O' => "\xf0\x9f\x98\xaf",
-		      ':-(' => "\xf0\x9f\x98\xa6",
+		      ':-(' => 'frownie.png',
 		      ':-)' => 'simple-smile.png',
 		      ':-?' => "\xf0\x9f\x98\xaf",
 		      ':-D' => "\xf0\x9f\x98\x84",
@@ -2986,7 +2986,7 @@ function smilies_init() {
 		// This one transformation breaks regular text with frequency.
 		//     '8)' => "\xf0\x9f\x98\x8e",
 		       '8O' => "\xf0\x9f\x98\xaf",
-		       ':(' => "\xf0\x9f\x98\xa6",
+		       ':(' => 'frownie.png',
 		       ':)' => 'simple-smile.png',
 		       ':?' => "\xf0\x9f\x98\xaf",
 		       ':D' => "\xf0\x9f\x98\x84",
diff --git a/src/wp-includes/images/smilies/frownie.png b/src/wp-includes/images/smilies/frownie.png
new file mode 100755
index 0000000000..1f888a6775
Binary files /dev/null and b/src/wp-includes/images/smilies/frownie.png differ
diff --git a/src/wp-includes/images/smilies/mrgreen.png b/src/wp-includes/images/smilies/mrgreen.png
index 0976247382..b5e541f72a 100755
Binary files a/src/wp-includes/images/smilies/mrgreen.png and b/src/wp-includes/images/smilies/mrgreen.png differ
diff --git a/src/wp-includes/images/smilies/rolleyes.png b/src/wp-includes/images/smilies/rolleyes.png
index cd5a713f4f..fe3bf8d508 100755
Binary files a/src/wp-includes/images/smilies/rolleyes.png and b/src/wp-includes/images/smilies/rolleyes.png differ
diff --git a/src/wp-includes/images/smilies/simple-smile.png b/src/wp-includes/images/smilies/simple-smile.png
index fbdcd03d2b..dc334abc6f 100755
Binary files a/src/wp-includes/images/smilies/simple-smile.png and b/src/wp-includes/images/smilies/simple-smile.png differ
diff --git a/tests/phpunit/tests/formatting/Smilies.php b/tests/phpunit/tests/formatting/Smilies.php
index 0bce4766ee..90283c6531 100644
--- a/tests/phpunit/tests/formatting/Smilies.php
+++ b/tests/phpunit/tests/formatting/Smilies.php
@@ -169,7 +169,7 @@ class Tests_Formatting_Smilies extends WP_UnitTestCase {
 		return array (
 			array (
 				'8-O :-(',
-				"\xf0\x9f\x98\xaf \xf0\x9f\x98\xa6"
+				"\xf0\x9f\x98\xaf <img src=\"http://example.org/wp-includes/images/smilies/frownie.png\" alt=\":-(\" class=\"wp-smiley\" style=\"height: 1em; max-height: 1em;\" />"
 			),
 			array (
 				'8-) 8-O',
@@ -181,7 +181,7 @@ class Tests_Formatting_Smilies extends WP_UnitTestCase {
 			),
 			array (
 				'8-) :-(',
-				"\xf0\x9f\x98\x8e \xf0\x9f\x98\xa6"
+				"\xf0\x9f\x98\x8e <img src=\"http://example.org/wp-includes/images/smilies/frownie.png\" alt=\":-(\" class=\"wp-smiley\" style=\"height: 1em; max-height: 1em;\" />"
 			),
 			array (
 				'8-) :twisted:',
@@ -189,7 +189,7 @@ class Tests_Formatting_Smilies extends WP_UnitTestCase {
 			),
 			array (
 				'8O :twisted: :( :? :(',
-				"\xf0\x9f\x98\xaf \xf0\x9f\x98\x88 \xf0\x9f\x98\xa6 \xf0\x9f\x98\xaf \xf0\x9f\x98\xa6"
+				"\xf0\x9f\x98\xaf \xf0\x9f\x98\x88 <img src=\"http://example.org/wp-includes/images/smilies/frownie.png\" alt=\":(\" class=\"wp-smiley\" style=\"height: 1em; max-height: 1em;\" /> \xf0\x9f\x98\xaf <img src=\"http://example.org/wp-includes/images/smilies/frownie.png\" alt=\":(\" class=\"wp-smiley\" style=\"height: 1em; max-height: 1em;\" />"
 			),
 		);
 	}