diff --git a/.meteor/versions b/.meteor/versions
index bad08f765f1..63af99e4c26 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -40,7 +40,7 @@ ecmascript-runtime@0.2.6
 edgee:slingshot@0.7.1
 ejson@1.0.7
 email@1.0.8
-emojione:emojione@2.1.2
+emojione:emojione@2.1.2_1
 facebook@1.2.2
 fastclick@1.0.7
 francocatena:status@1.5.1
diff --git a/packages/rocketchat-emojione/rocketchat.coffee b/packages/rocketchat-emojione/rocketchat.coffee
index 59fda3225f4..3f83020fe77 100644
--- a/packages/rocketchat-emojione/rocketchat.coffee
+++ b/packages/rocketchat-emojione/rocketchat.coffee
@@ -1,6 +1,10 @@
 # RocketChat.emoji should be set to an object representing the emoji package used
 RocketChat.emoji = emojione
 
+RocketChat.emoji.imageType = 'svg';
+RocketChat.emoji.imagePathSVGSprites = '/packages/emojione_emojione/assets/sprites/emojione.sprites.svg';
+RocketChat.emoji.sprites = true;
+
 # RocketChat.emoji.list is the collection of emojis
 RocketChat.emoji.list = emojione.emojioneList
 
@@ -10,4 +14,4 @@ RocketChat.emoji.class = 'Emojione'
 # Additional settings -- ascii emojis
 Meteor.startup ->
 	Tracker.autorun ->
-		emojione?.ascii = if Meteor.user()?.settings?.preferences?.convertAsciiEmoji? then Meteor.user().settings.preferences.convertAsciiEmoji else true
\ No newline at end of file
+		emojione?.ascii = if Meteor.user()?.settings?.preferences?.convertAsciiEmoji? then Meteor.user().settings.preferences.convertAsciiEmoji else true
diff --git a/packages/rocketchat-reactions/client/stylesheets/reaction.less b/packages/rocketchat-reactions/client/stylesheets/reaction.less
index bbfe89bf631..935e18258a8 100644
--- a/packages/rocketchat-reactions/client/stylesheets/reaction.less
+++ b/packages/rocketchat-reactions/client/stylesheets/reaction.less
@@ -15,7 +15,7 @@
 			padding-right: 2px;
 
 			.reaction-emoji {
-				img {
+				.emojione {
 					min-width: 15px;
 					min-height: 15px;
 					width: 15px;