diff --git a/templates/zerver/help/add-custom-emoji.md b/templates/zerver/help/add-custom-emoji.md
index d9ea1e4824..a100901d16 100644
--- a/templates/zerver/help/add-custom-emoji.md
+++ b/templates/zerver/help/add-custom-emoji.md
@@ -27,8 +27,8 @@ are treated the same as spaces.
 You can replace a default emoji by adding a custom emoji of the same
 name. If an emoji has several names, you must use the emoji's primary name
 to replace it. You can find the primary name of an emoji by hovering over it
-in the [emoji picker](/help/add-emoji), while the search box is empty (you
-may have to scroll down a bit to find it).
+in the [emoji picker](/help/emoji-and-emoticons#select-from-the-emoji-picker),
+while the search box is empty (you may have to scroll down a bit to find it).
 
 ## Delete a custom emoji
 
diff --git a/templates/zerver/help/add-emoji.md b/templates/zerver/help/add-emoji.md
deleted file mode 100644
index 48b54d8b63..0000000000
--- a/templates/zerver/help/add-emoji.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Add emoji
-
-Emoji are little characters and that add some fun to your messages! This guide
-shows you how to send messages containing emoji by using Zulip’s built-in emoji
-menu, pasting Unicode, or manually inputting the emoji code.
-
-## Using the emoji menu
-{!start-composing.md!}
-2. Click the smiley face (<i class="icon-vector-smile"></i>) icon in the
-bottom left corner of the compose box.
-3. Upon clicking on the smiley face (<i class="icon-vector-smile"></i>)
-icon, the emoji menu will appear below the compose box. Click on an emoji in
-the emoji menu to include it in your message.
-
-## Pasting Unicode
-Zulip fully supports Unicode emoji. To use Unicode emoji in your message:
-
-1. Copy any emoji you would like to include onto your clipboard, such as 😀.
-{!start-composing.md!}
-3. Paste the emoji into the **Compose your message here...** field of the
-compose box.
-
-!!! tip ""
-    You can browse the
-    [Unicode Consortium's full list of emoji](http://unicode.org/emoji/charts/full-emoji-list.html);
-    however, Zulip emoji may look different than the ones listed.
-
-## Using emoji codes
-{!start-composing.md!}
-2. In the **Compose your message here...** field, type in the emoji code
-surrounded by colons. For example, `:smile:` produces the <img
-src="/static/generated/emoji/images/emoji/smile.png" alt="smile"
-style="width: 3%;"/> emoji.
-
-!!! tip ""
-    If you are unsure of the code for any particular emoji, visit
-    [Emoji Cheat Sheet](http://www.webpagefx.com/tools/emoji-cheat-sheet/)
-    for a complete list. Furthermore, after typing `:` and any two letters,
-    autocomplete suggestions will appear. These emoji contain the letters you
-    typed and are sorted alphabetically by code. You can also cycle through
-    these suggestions by using the `↑` and `↓` arrow keys.
diff --git a/templates/zerver/help/emoji-and-emoticons.md b/templates/zerver/help/emoji-and-emoticons.md
new file mode 100644
index 0000000000..8b24d4ea7e
--- /dev/null
+++ b/templates/zerver/help/emoji-and-emoticons.md
@@ -0,0 +1,42 @@
+# Emoji and emoticons
+
+## Add emoji to a message
+
+There are several ways to add emoji to a message: typing emoji codes,
+selecting from an emoji picker, using emoticons, or pasting unicode.
+
+### Type an emoji code
+
+{!start-composing.md!}
+
+1. Type `:` followed by a few letters to open the emoji autocomplete. The
+   letters don't have to be at the beginning of the emoji name; `:ppl` will
+   match `:apple:`
+
+If you don't know the code for an emoji, you can see what it's called in the
+emoji picker, or hover over the emoji in a message.
+
+### Select from the emoji picker
+
+{!start-composing.md!}
+
+1. Click the smiley face (<i class="icon-vector-smile"></i>) icon at the
+   bottom of the compose box.
+
+1. Select an emoji. You can type to search, use the arrow keys, or click on
+   an emoji with your mouse.
+
+### Use emoticons
+
+[Enable emoticon translations](/help/enable-emoticon-translations), and then
+type away :). That link also has the list of supported emoticons.
+
+### Paste unicode
+
+Copying and pasting emoji from other apps generally works.
+
+## Related articles
+
+* [Add custom emoji](/help/add-custom-emoji)
+* [Emoji reactions](/help/emoji-reactions)
+* [View emoji as text](/help/view-emoji-as-text)
diff --git a/templates/zerver/help/include/sidebar_index.md b/templates/zerver/help/include/sidebar_index.md
index 42f68dec11..c7559725fc 100644
--- a/templates/zerver/help/include/sidebar_index.md
+++ b/templates/zerver/help/include/sidebar_index.md
@@ -26,7 +26,7 @@
 * [Format messages using Markdown](/help/format-your-message-using-markdown)
 * [Preview messages before sending](/help/preview-your-message-before-sending)
 * [Message drafts](/help/view-and-edit-your-message-drafts)
-* [Emoji](/help/add-emoji)
+* [Emoji and emoticons](/help/emoji-and-emoticons)
 * [Video calls](/help/start-a-call)
 * [Share and upload files](/help/upload-and-share-files)
 * [Manage your uploaded files](/help/manage-your-uploaded-files)