diff --git a/THIRDPARTY.md b/THIRDPARTY.md
index b49ae42..53c0a37 100644
--- a/THIRDPARTY.md
+++ b/THIRDPARTY.md
@@ -37,4 +37,4 @@ CC BY 4.0 compliance: Modified to indicate the URL. Modified size.
 Affected files: everything in [`data/static/emoji`](./data/static/emoji)
 URL: https://gh.vercte.net/forumoji/  
 License: CC0 1.0  
-Designers: lolecksdeehaha; Scratch137; 64lu (the project has many more contributors, but these are the people whose designs were reproduced here)
+Designers: lolecksdeehaha; Scratch137; 64lu; stickfiregames; mybearworld (the project has many more contributors, but these are the people whose designs were reproduced here)
diff --git a/data/static/emoji/lobster.png b/data/static/emoji/lobster.png
new file mode 100644
index 0000000..f735479
Binary files /dev/null and b/data/static/emoji/lobster.png differ
diff --git a/data/static/emoji/pensive.png b/data/static/emoji/pensive.png
new file mode 100644
index 0000000..ce6246b
Binary files /dev/null and b/data/static/emoji/pensive.png differ
diff --git a/data/static/emoji/smiletear.png b/data/static/emoji/smiletear.png
new file mode 100644
index 0000000..e9b338a
Binary files /dev/null and b/data/static/emoji/smiletear.png differ
diff --git a/data/static/emoji/weary.png b/data/static/emoji/weary.png
new file mode 100644
index 0000000..6edbf94
Binary files /dev/null and b/data/static/emoji/weary.png differ
diff --git a/lib/babycode-emoji.lua b/lib/babycode-emoji.lua
index de71e4a..b2fe232 100644
--- a/lib/babycode-emoji.lua
+++ b/lib/babycode-emoji.lua
@@ -1,4 +1,4 @@
-local emoji_template = " <img class=emoji src=\"/emoji/$NAME.png\" alt=\"$NAME\" title=\"$NAME\"> "
+local emoji_template = " <img class=emoji src=\"/emoji/$NAME.png\" alt=\"$NAME\" title=\":$NAME:\"> "
 local emoji_pat = "%$NAME"
 
 return {
@@ -13,10 +13,17 @@ return {
   ["angryimp"] = emoji_template:gsub(emoji_pat, "impangry"),
   ["impangry"] = emoji_template:gsub(emoji_pat, "impangry"),
   
+  ["lobster"] = emoji_template:gsub(emoji_pat, "lobster"),
+  
   ["|"] = emoji_template:gsub(emoji_pat, "neutral"),
   
+  ["pensive"] = emoji_template:gsub(emoji_pat, "pensive"),
+  
   [")"] = emoji_template:gsub(emoji_pat, "smile"),
   
+  ["smiletear"] = emoji_template:gsub(emoji_pat, "smiletear"),
+  ["crytear"] = emoji_template:gsub(emoji_pat, "smiletear"),
+  
   [","] = emoji_template:gsub(emoji_pat, "sob"),
   ["T"] = emoji_template:gsub(emoji_pat, "sob"),
   ["cry"] = emoji_template:gsub(emoji_pat, "sob"),
@@ -32,6 +39,8 @@ return {
   ["P"] = emoji_template:gsub(emoji_pat, "tongue"),
   ["p"] = emoji_template:gsub(emoji_pat, "tongue"),
   
+  ["weary"] = emoji_template:gsub(emoji_pat, "weary"),
+  
   [";"] = emoji_template:gsub(emoji_pat, "wink"),
   ["wink"] = emoji_template:gsub(emoji_pat, "wink"),
 }
diff --git a/views/common/bbcode_help.etlua b/views/common/bbcode_help.etlua
index f888c43..02b649a 100644
--- a/views/common/bbcode_help.etlua
+++ b/views/common/bbcode_help.etlua
@@ -6,18 +6,22 @@
       <details>
         <summary>Forumoji (emoticons)</summary>
         <ul>
-          <li><img class="emoji" src="/emoji/smile.png" alt="smile" title="smile"> - <code class=inline-code>:): </code></li>
-          <li><img class="emoji" src="/emoji/frown.png" alt="frown" title="frown"> - <code class=inline-code>:(: </code></li>
-          <li><img class="emoji" src="/emoji/grin.png" alt="grin" title="grin"> - <code class=inline-code>:D: </code></li>
-          <li><img class="emoji" src="/emoji/neutral.png" alt="neutral" title="neutral"> - <code class=inline-code>:|: </code></li>
-          <li><img class="emoji" src="/emoji/angry.png" alt="angry" title="angry"> - <code class=inline-code>:angry: </code></li>
-          <li><img class="emoji" src="/emoji/sob.png" alt="sob" title="sob"> - <code class=inline-code>:,: :cry: :sob: :T: </code></li>
-          <li><img class="emoji" src="/emoji/surprised.png" alt="surprised" title="surprised"> - <code class=inline-code>:o: :O: </code></li>
-          <li><img class="emoji" src="/emoji/think.png" alt="think" title="think"> - <code class=inline-code>:hmm: :think: :thinking: </code></li>
-          <li><img class="emoji" src="/emoji/tongue.png" alt="tongue" title="tongue"> - <code class=inline-code>:p: :P: </code></li>
-          <li><img class="emoji" src="/emoji/wink.png" alt="wink" title="wink"> - <code class=inline-code>:;: :wink: </code></li>
-          <li><img class="emoji" src="/emoji/imp.png" alt="imp" title="imp"> - <code class=inline-code>:imp: </code></li>
-          <li><img class="emoji" src="/emoji/impangry.png" alt="impangry" title="impangry"> - <code class=inline-code>:angryimp: :impangry: </code></li>
+          <li><img class="emoji" src="/emoji/smile.png" alt="smile" title=":smile:"> - <code class=inline-code>:): </code></li>
+          <li><img class="emoji" src="/emoji/frown.png" alt="frown" title=":frown:"> - <code class=inline-code>:(: </code></li>
+          <li><img class="emoji" src="/emoji/grin.png" alt="grin" title=":grin:"> - <code class=inline-code>:D: </code></li>
+          <li><img class="emoji" src="/emoji/neutral.png" alt="neutral" title=":neutral:"> - <code class=inline-code>:|: </code></li>
+          <li><img class="emoji" src="/emoji/angry.png" alt="angry" title=":angry:"> - <code class=inline-code>:angry: </code></li>
+          <li><img class="emoji" src="/emoji/sob.png" alt="sob" title=":sob:"> - <code class=inline-code>:,: :cry: :sob: :T: </code></li>
+          <li><img class="emoji" src="/emoji/surprised.png" alt="surprised" title=":surprised:"> - <code class=inline-code>:o: :O: </code></li>
+          <li><img class="emoji" src="/emoji/think.png" alt="think" title=":think:"> - <code class=inline-code>:hmm: :think: :thinking: </code></li>
+          <li><img class="emoji" src="/emoji/tongue.png" alt="tongue" title=":tongue:"> - <code class=inline-code>:p: :P: </code></li>
+          <li><img class="emoji" src="/emoji/wink.png" alt="wink" title=":wink:"> - <code class=inline-code>:;: :wink: </code></li>
+          <li><img class="emoji" src="/emoji/imp.png" alt="imp" title=":imp:"> - <code class=inline-code>:imp: </code></li>
+          <li><img class="emoji" src="/emoji/impangry.png" alt="impangry" title=":impangry:"> - <code class=inline-code>:angryimp: :impangry: </code></li>
+          <li><img class="emoji" src="/emoji/lobster.png" alt="lobster" title=":lobster:"> - <code class=inline-code>:lobster:</code></li>
+          <li><img class="emoji" src="/emoji/pensive.png" alt="pensive" title=":pensive:"> - <code class=inline-code>:pensive:</code></li>
+          <li><img class="emoji" src="/emoji/weary.png" alt="weary" title=":weary:"> - <code class=inline-code>:weary:</code></li>
+          <li><img class="emoji" src="/emoji/smiletear.png" alt="smiletear" title=":smiletear:"> - <code class=inline-code>:smiletear: :crytear:</code></li>
         </ul>
       </details>
     </li>