diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 3aa16b66944..bca32322096 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -100,6 +100,10 @@ module IssuesHelper
     list.join(", ")
   end
 
+  def emoji_list
+    ::AwardEmoji::EMOJI_LIST
+  end
+
   # Required for Gitlab::Markdown::IssueReferenceFilter
   module_function :url_for_issue
 end
diff --git a/app/views/votes/_votes_block.html.haml b/app/views/votes/_votes_block.html.haml
index 2ae832c31f7..02947f2979e 100644
--- a/app/views/votes/_votes_block.html.haml
+++ b/app/views/votes/_votes_block.html.haml
@@ -9,7 +9,7 @@
   .dropdown.awards-controls
     %a#add-award{"data-toggle" => "dropdown", "data-target" => "#", "href" => "#"} +
     %ul.dropdown-menu.awards-menu
-      - ["100", "blush", "heart", "smile", "rage", "beers", "thumbsup", "disappointed", "ok_hand", "helicopter"].each do |emoji|
+      - emoji_list.each do |emoji|
         %li{"data-emoji" => "#{emoji}"}= image_tag url_to_emoji(emoji), height: "20px", width: "20px"
 
   
diff --git a/lib/award_emoji.rb b/lib/award_emoji.rb
new file mode 100644
index 00000000000..95b9c8f921a
--- /dev/null
+++ b/lib/award_emoji.rb
@@ -0,0 +1,6 @@
+class AwardEmoji
+  EMOJI_LIST = ["+1", "-1", "100", "blush", "heart", "smile", "rage",
+    "beers", "disappointed", "ok_hand",
+    "helicopter", "shit", "airplane", "alarm_clock",
+    "ambulance", "anguished", "two_hearts", "wink"]
+end
\ No newline at end of file