diff --git a/app/models/emoji_set_site_setting.rb b/app/models/emoji_set_site_setting.rb
index b40a92a2ae3..b99552b397d 100644
--- a/app/models/emoji_set_site_setting.rb
+++ b/app/models/emoji_set_site_setting.rb
@@ -29,11 +29,11 @@ class EmojiSetSiteSetting < EnumSiteSetting
 
   def self.values
     @values ||= [
-      { name: 'apple_international', value: 'apple' },
-      { name: 'google', value: 'google' },
-      { name: 'twitter', value: 'twitter' },
-      { name: 'emoji_one', value: 'emoji_one' },
-      { name: 'win10_emoji', value: 'win10' }
+      { name: 'emoji_set.apple_international', value: 'apple' },
+      { name: 'emoji_set.google', value: 'google' },
+      { name: 'emoji_set.twitter', value: 'twitter' },
+      { name: 'emoji_set.emoji_one', value: 'emoji_one' },
+      { name: 'emoji_set.win10', value: 'win10' }
     ]
   end
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 30cbc2a1827..553fee8d542 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -995,11 +995,12 @@ en:
         title: "with GitHub"
         message: "Authenticating with GitHub (make sure pop up blockers are not enabled)"
 
-    apple_international: "Apple/International"
-    google: "Google"
-    twitter: "Twitter"
-    emoji_one: "Emoji One"
-    win10_emoji: "Win10"
+    emoji_set:
+      apple_international: "Apple/International"
+      google: "Google"
+      twitter: "Twitter"
+      emoji_one: "Emoji One"
+      win10: "Win10"
 
     shortcut_modifier_key:
       shift: 'Shift'