diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index 1c4a445b74..a3d12221ac 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -3224,7 +3224,7 @@ function smilies_init() {
':idea:' => "\xf0\x9f\x92\xa1",
':oops:' => "\xf0\x9f\x98\xb3",
':razz:' => "\xf0\x9f\x98\x9b",
- ':roll:' => 'rolleyes.png',
+ ':roll:' => "\xf0\x9f\x99\x84",
':wink:' => "\xf0\x9f\x98\x89",
':cry:' => "\xf0\x9f\x98\xa5",
':eek:' => "\xf0\x9f\x98\xae",
diff --git a/tests/phpunit/tests/formatting/Smilies.php b/tests/phpunit/tests/formatting/Smilies.php
index 5e487c2312..9cd3b06f1c 100644
--- a/tests/phpunit/tests/formatting/Smilies.php
+++ b/tests/phpunit/tests/formatting/Smilies.php
@@ -188,8 +188,8 @@ class Tests_Formatting_Smilies extends WP_UnitTestCase {
"\xf0\x9f\x98\x8e \xf0\x9f\x98\x88"
),
array (
- '8O :twisted: :( :? :roll:',
- "\xf0\x9f\x98\xaf \xf0\x9f\x98\x88 \xf0\x9f\x99\x81 \xf0\x9f\x98\x95
"
+ '8O :twisted: :( :? :roll: :mrgreen:',
+ "\xf0\x9f\x98\xaf \xf0\x9f\x98\x88 \xf0\x9f\x99\x81 \xf0\x9f\x98\x95 \xf0\x9f\x99\x84
"
),
);
}