--- old/modules/javafx.graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java	2017-06-29 19:10:56.000000000 +0530
+++ new/modules/javafx.graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java	2017-06-29 19:10:55.000000000 +0530
@@ -1022,6 +1022,10 @@
             fontRegInfo[0].add("/System/Library/Fonts/Apple Symbols.ttf");
             fontRegInfo[1].add("Apple Symbols");
 
+            // Add Apple Emoji Symbols to Mac OS X fallback list
+            fontRegInfo[0].add("/System/Library/Fonts/Apple Color Emoji.ttc");
+            fontRegInfo[1].add("Apple Color Emoji");
+
             // Add CJK Ext B supplementary characters.
             fontRegInfo[0].add("/System/Library/Fonts/STHeiti Light.ttf");
             fontRegInfo[1].add("Heiti SC Light");