2 files changed, 60 insertions, 2 deletions

diff --git a/webapp/utils/emoji.json b/webapp/utils/emoji.json
index 1ccb129f2..c01f5b679 100644
--- a/webapp/utils/emoji.json
+++ b/webapp/utils/emoji.json
@@ -8124,6 +8124,64 @@
     ]
   }
 , {
+    "emoji": "🇨🇦"
+  , "description": "regional indicator symbol letter c + regional indicator symbol letter a"
+  , "aliases": [
+      "ca",
+      "eh"
+    ]
+  , "tags": [
+      "canada"
+    ]
+  }
+, {
+    "emoji": "🇵🇰"
+  , "description": "regional indicator symbol letter p + regional indicator symbol letter k"
+  , "aliases": [
+      "pk"
+    ]
+  , "tags": [
+      "pakistan"
+    ]
+  }
+, {
+    "emoji": "🇿🇦"
+  , "description": "regional indicator symbol letter z + regional indicator symbol letter a"
+  , "aliases": [
+      "za"
+    ]
+  , "tags": [
+      "south_africa"
+    ]
+  }
+, {
+    "emoji": "🙂"
+  , "description": "slightly smiling face"
+  , "aliases": [
+      "slightly_smiling_face"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🙁"
+  , "description": "slightly frowning face"
+  , "aliases": [
+      "slightly_frowning_face"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🙃"
+  , "description": "upside-down face"
+  , "aliases": [
+      "upside_down_face"
+    ]
+  , "tags": [
+    ]
+  }
+, {
     "aliases": [
       "basecamp"
     ]
diff --git a/webapp/utils/emoticons.jsx b/webapp/utils/emoticons.jsx
index d3afe372a..86f7a5b7b 100644
--- a/webapp/utils/emoticons.jsx
+++ b/webapp/utils/emoticons.jsx
@@ -7,7 +7,7 @@ import Constants from './constants.jsx';
 import emojis from './emoji.json';
 
 const emoticonPatterns = {
-    smile: /(^|\s)(:-?\))(?=$|\s)/g, // :)
+    slightly_smiling_face: /(^|\s)(:-?\))(?=$|\s)/g, // :)
     wink: /(^|\s)(;-?\))(?=$|\s)/g, // ;)
     open_mouth: /(^|\s)(:o)(?=$|\s)/gi, // :o
     scream: /(^|\s)(:-o)(?=$|\s)/gi, // :-o
@@ -16,7 +16,7 @@ const emoticonPatterns = {
     stuck_out_tongue_closed_eyes: /(^|\s)(x-d)(?=$|\s)/gi, // x-d
     stuck_out_tongue: /(^|\s)(:-?p)(?=$|\s)/gi, // :p
     rage: /(^|\s)(:-?[\[@])(?=$|\s)/g, // :@
-    frowning: /(^|\s)(:-?\()(?=$|\s)/g, // :(
+    slightly_frowning_face: /(^|\s)(:-?\()(?=$|\s)/g, // :(
     cry: /(^|\s)(:['’]-?\(|:'\(|:'\()(?=$|\s)/g, // :`(
     confused: /(^|\s)(:-?\/)(?=$|\s)/g, // :/
     confounded: /(^|\s)(:-?s)(?=$|\s)/gi, // :s