diff --git a/plugins/emoji/assets/javascripts/emoji.js.erb b/plugins/emoji/assets/javascripts/emoji.js.erb
index d6e20270e..17fbbabce 100644
--- a/plugins/emoji/assets/javascripts/emoji.js.erb
+++ b/plugins/emoji/assets/javascripts/emoji.js.erb
@@ -25,8 +25,8 @@
     ':-P'   : 'stuck_out_tongue',
     ':O'   : 'open_mouth',
     ':-O'   : 'open_mouth',
-    ':D'   : 'grin',
-    ':-D'   : 'grin',
+    ':D'   : 'smiley',
+    ':-D'   : 'smiley',
     ':|'   : 'expressionless',
     ':-|'   : 'expressionless',
     ";P"   : 'stuck_out_tongue_winking_eye',