diff --git a/templates/zerver/help/add-a-bot-or-integration.md b/templates/zerver/help/add-a-bot-or-integration.md
index 32d6010111..86f9f9685a 100644
--- a/templates/zerver/help/add-a-bot-or-integration.md
+++ b/templates/zerver/help/add-a-bot-or-integration.md
@@ -24,4 +24,4 @@ is visible and available for anyone to use.
Depending on the type of bot you're creating, you may need to download its
`.zuliprc` configuration file. For that, click the **download**
-() icon under the bot's name.
+() icon under the bot's name.
diff --git a/templates/zerver/help/add-custom-emoji.md b/templates/zerver/help/add-custom-emoji.md
index a100901d16..0997163a9f 100644
--- a/templates/zerver/help/add-custom-emoji.md
+++ b/templates/zerver/help/add-custom-emoji.md
@@ -34,7 +34,7 @@ while the search box is empty (you may have to scroll down a bit to find it).
{settings_tab|emoji-settings}
-1. Click the trash icon () next to the
+1. Click the trash icon () next to the
emoji that you would like to delete.
Deleting an emoji will not affect any existing messages or emoji
diff --git a/templates/zerver/help/at-mention-a-team-member.md b/templates/zerver/help/at-mention-a-team-member.md
index f4253f8d0d..a2abf2a810 100644
--- a/templates/zerver/help/at-mention-a-team-member.md
+++ b/templates/zerver/help/at-mention-a-team-member.md
@@ -17,7 +17,7 @@ messages and alert words.
1. Hover over a user in the right sidebar.
-1. Click the down chevron () to the right.
+1. Click the down chevron () to the right.
1. Select **Reply mentioning user**.
diff --git a/templates/zerver/help/change-a-users-name.md b/templates/zerver/help/change-a-users-name.md
index 32dd597059..cfb7babba2 100644
--- a/templates/zerver/help/change-a-users-name.md
+++ b/templates/zerver/help/change-a-users-name.md
@@ -11,7 +11,7 @@ Organization administrators can always change any user's name.
{settings_tab|user-list-admin}
1. Find the user you would like to manage. Click the **pencil**
-() to the right of their name.
+() to the right of their name.
1. Under **Full name**, enter a new name.
diff --git a/templates/zerver/help/change-the-stream-description.md b/templates/zerver/help/change-the-stream-description.md
index ed125900cf..43c07efe40 100644
--- a/templates/zerver/help/change-the-stream-description.md
+++ b/templates/zerver/help/change-the-stream-description.md
@@ -6,7 +6,7 @@
1. Select a stream.
-1. On the right, click the **pencil** ()
+1. On the right, click the **pencil** ()
next to the stream description. Enter a new description.
1. Click the **checkmark** to save.
diff --git a/templates/zerver/help/compose-and-reply.md b/templates/zerver/help/compose-and-reply.md
index aac4fe25e3..c043ef3a70 100644
--- a/templates/zerver/help/compose-and-reply.md
+++ b/templates/zerver/help/compose-and-reply.md
@@ -51,7 +51,7 @@ the recipient bar to match.
### Start a PM with a user
Click on a user's avatar, an @-mention, or on the down chevron
-() to the right of their name in the
+() to the right of their name in the
right sidebar.
Click **Send private message**.
@@ -60,7 +60,7 @@ Keyboard shortcut: `>`
### Reply mentioning user
Click on a user's avatar, an @-mention, or on the down chevron
-() to the right of their name in the
+() to the right of their name in the
right sidebar.
Click **Reply mentioning user**.
diff --git a/templates/zerver/help/connect-through-a-proxy.md b/templates/zerver/help/connect-through-a-proxy.md
index 52b33f1d99..6cfa60382a 100644
--- a/templates/zerver/help/connect-through-a-proxy.md
+++ b/templates/zerver/help/connect-through-a-proxy.md
@@ -11,7 +11,7 @@ a single website.
## Desktop
-1. Click on the **gear** () icon in the lower left corner.
+1. Click on the **gear** () icon in the lower left corner.
2. Select the **Network** tab.
diff --git a/templates/zerver/help/custom-certificates.md b/templates/zerver/help/custom-certificates.md
index b6d393370b..14fc52821b 100644
--- a/templates/zerver/help/custom-certificates.md
+++ b/templates/zerver/help/custom-certificates.md
@@ -26,7 +26,7 @@ before you can connect to your Zulip server. You'll need to get a
certificate file (should end in `.crt` or `.pem`) from your server
administrator.
-1. Click on the **gear** () icon in the lower left corner.
+1. Click on the **gear** () icon in the lower left corner.
2. Select the **Organizations** tab.
diff --git a/templates/zerver/help/edit-or-delete-a-message.md b/templates/zerver/help/edit-or-delete-a-message.md
index 6da00e7cbf..9c4c148863 100644
--- a/templates/zerver/help/edit-or-delete-a-message.md
+++ b/templates/zerver/help/edit-or-delete-a-message.md
@@ -11,7 +11,7 @@ entirely.
{!message-actions.md!}
-1. Click the pencil () icon.
+1. Click the pencil () icon.
2. After making the changes to your message in the message editing box, click
the **Save** button to save the changes you made to your message.
@@ -26,11 +26,11 @@ the **Save** button to save the changes you made to your message.
Depending on your organization settings, Zulip may be configured with a time
limit within which you may edit a message (e.g. 10 minutes). As soon as that
-limit has passed, the pencil () icon
-changes to a file () icon.
+limit has passed, the pencil () icon
+changes to a file () icon.
!!! tip ""
- Clicking on the file () icon will allow you to
+ Clicking on the file () icon will allow you to
view the [Markdown source](/help/view-the-markdown-source-of-a-message) or
[change the topic](/help/change-the-topic-of-a-message) of your message.
diff --git a/templates/zerver/help/emoji-and-emoticons.md b/templates/zerver/help/emoji-and-emoticons.md
index 8b24d4ea7e..40f7d7ccff 100644
--- a/templates/zerver/help/emoji-and-emoticons.md
+++ b/templates/zerver/help/emoji-and-emoticons.md
@@ -20,7 +20,7 @@ emoji picker, or hover over the emoji in a message.
{!start-composing.md!}
-1. Click the smiley face () icon at the
+1. Click the smiley face () icon at the
bottom of the compose box.
1. Select an emoji. You can type to search, use the arrow keys, or click on
diff --git a/templates/zerver/help/emoji-reactions.md b/templates/zerver/help/emoji-reactions.md
index d26dea77ab..b3ac3fb093 100644
--- a/templates/zerver/help/emoji-reactions.md
+++ b/templates/zerver/help/emoji-reactions.md
@@ -9,11 +9,11 @@ underneath the message.
{!message-actions.md!}
-1. Click the smiley face () icon.
+1. Click the smiley face () icon.
!!! tip ""
For messages that you sent, click the down chevron
- () and then
+ () and then
**Add emoji reaction**.
1. Select an emoji. Type to search, use the arrow keys, or click on an emoji
diff --git a/templates/zerver/help/include/go-to-stream-via-all-streams.md b/templates/zerver/help/include/go-to-stream-via-all-streams.md
index 7221b6579c..3a51ad3971 100644
--- a/templates/zerver/help/include/go-to-stream-via-all-streams.md
+++ b/templates/zerver/help/include/go-to-stream-via-all-streams.md
@@ -1,4 +1,4 @@
-1. From your desktop, click on the gear () in the upper right corner.
+1. From your desktop, click on the gear () in the upper right corner.
1. Select **Manage streams**.
diff --git a/templates/zerver/help/include/message-actions-menu.md b/templates/zerver/help/include/message-actions-menu.md
index c03303795b..3e78232303 100644
--- a/templates/zerver/help/include/message-actions-menu.md
+++ b/templates/zerver/help/include/message-actions-menu.md
@@ -1,3 +1,3 @@
1. Hover over a message to reveal three icons on the right.
-1. Click the down chevron ().
+1. Click the down chevron ().
diff --git a/templates/zerver/help/include/stream-actions.md b/templates/zerver/help/include/stream-actions.md
index e525557619..ecc8a20bd9 100644
--- a/templates/zerver/help/include/stream-actions.md
+++ b/templates/zerver/help/include/stream-actions.md
@@ -1,3 +1,3 @@
1. Hover over a stream in the left sidebar.
-1. Click on the down chevron ().
+1. Click on the down chevron ().
diff --git a/templates/zerver/help/logging-out.md b/templates/zerver/help/logging-out.md
index 091c89fd0d..4315dd5c97 100644
--- a/templates/zerver/help/logging-out.md
+++ b/templates/zerver/help/logging-out.md
@@ -3,21 +3,21 @@
{start_tabs}
{tab|desktop-web}
-1. Click on the **gear** () icon in the upper
+1. Click on the **gear** () icon in the upper
right corner.
2. Click **Log out**.
{tab|ios}
-1. Tap the menu () icon in the top left
+1. Tap the menu () icon in the top left
corner of the screen.
2. Tap **Log out**.
{tab|android}
-1. Tap the overflow ( ) icon in
+1. Tap the overflow ( ) icon in
the top right corner of the screen.
2. Tap **Log out**.
diff --git a/templates/zerver/help/make-a-user-an-administrator.md b/templates/zerver/help/make-a-user-an-administrator.md
index d41895e4d3..a248d3dc5a 100644
--- a/templates/zerver/help/make-a-user-an-administrator.md
+++ b/templates/zerver/help/make-a-user-an-administrator.md
@@ -9,7 +9,7 @@ member an administrator, or revoke admin access from any other administrator.
{settings_tab|user-list-admin}
1. Find the user you would like to manage. Click the **pencil**
-() to the right of their name.
+() to the right of their name.
1. Under **User role**, select **Member** or **Administrator**.
diff --git a/templates/zerver/help/mute-a-topic.md b/templates/zerver/help/mute-a-topic.md
index def41b9dbc..dcad719ff8 100644
--- a/templates/zerver/help/mute-a-topic.md
+++ b/templates/zerver/help/mute-a-topic.md
@@ -13,8 +13,8 @@ Muted topics still appear in the left sidebar, though they are grayed out.
1. On the left, click on the stream that contains the topic you want to mute or unmute.
2. Hover over the topic to reveal a down chevron
- () to its right.
- Click on the down chevron ().
+ () to its right.
+ Click on the down chevron ().
4. Select **Mute (or unmute) the topic **.
diff --git a/templates/zerver/help/preview-your-message-before-sending.md b/templates/zerver/help/preview-your-message-before-sending.md
index 80432a63b3..353b8d4d81 100644
--- a/templates/zerver/help/preview-your-message-before-sending.md
+++ b/templates/zerver/help/preview-your-message-before-sending.md
@@ -2,6 +2,6 @@
{!start-composing.md!}
-1. Click the **eye** () icon at the bottom of the compose box.
+1. Click the **eye** () icon at the bottom of the compose box.
-Click the **pencil and paper** () icon to resume editing.
+Click the **pencil and paper** () icon to resume editing.
diff --git a/templates/zerver/help/rename-a-stream.md b/templates/zerver/help/rename-a-stream.md
index 67d62982bc..3e0f0f784e 100644
--- a/templates/zerver/help/rename-a-stream.md
+++ b/templates/zerver/help/rename-a-stream.md
@@ -6,7 +6,7 @@
1. Select a stream.
-1. On the right, click the **pencil** ()
+1. On the right, click the **pencil** ()
next to the stream name. Enter a new name.
1. Click the **checkmark** to save.
diff --git a/templates/zerver/help/search-for-messages.md b/templates/zerver/help/search-for-messages.md
index 8bcd346b36..9e6ad56edb 100644
--- a/templates/zerver/help/search-for-messages.md
+++ b/templates/zerver/help/search-for-messages.md
@@ -71,5 +71,5 @@ keywords are ignored, we'll return 0 search results.
Zulip organization).
* To see the list of search operators in-app, click the **gear** () icon in the upper right, and select
+ class="fa fa-cog">) icon in the upper right, and select
**Search operators**.
diff --git a/templates/zerver/help/share-and-upload-files.md b/templates/zerver/help/share-and-upload-files.md
index 0e01c5534e..e54deeb629 100644
--- a/templates/zerver/help/share-and-upload-files.md
+++ b/templates/zerver/help/share-and-upload-files.md
@@ -6,7 +6,7 @@ Attach files to messages, including images, documents, sound, and video.
* **Drag and drop** files into the compose box.
* **Copy and paste** files into the compose box.
-* **Click the paperclip** () icon at
+* **Click the paperclip** () icon at
the bottom of the compose box to find files on your computer.
Zulip will insert a link to the file, in Markdown format:
diff --git a/templates/zerver/help/star-a-message.md b/templates/zerver/help/star-a-message.md
index 6f9421ab23..1c9befabf6 100644
--- a/templates/zerver/help/star-a-message.md
+++ b/templates/zerver/help/star-a-message.md
@@ -5,10 +5,10 @@ tasks you need to go back to or documents you reference often.
{!message-actions.md!}
-1. Click the star () icon.
+1. Click the star () icon.
You can access your starred messages by clicking **Starred Messages** in the
left sidebar, or by [searching](/help/search-for-messages) for `is:starred`.
-Starred messages have a filled in star () to
+Starred messages have a filled in star () to
their right. Click on it to unstar the message.
diff --git a/templates/zerver/help/stream-notifications.md b/templates/zerver/help/stream-notifications.md
index 8b422eef97..d8fa29ca40 100644
--- a/templates/zerver/help/stream-notifications.md
+++ b/templates/zerver/help/stream-notifications.md
@@ -26,7 +26,7 @@ you join in the future.
1. Hover over the stream in the left sidebar.
-2. Click the down chevron () to the
+2. Click the down chevron () to the
right of the stream.
3. Click **Stream settings**.
diff --git a/templates/zerver/help/view-and-edit-your-message-drafts.md b/templates/zerver/help/view-and-edit-your-message-drafts.md
index d525f127ee..1867e3d04b 100644
--- a/templates/zerver/help/view-and-edit-your-message-drafts.md
+++ b/templates/zerver/help/view-and-edit-your-message-drafts.md
@@ -11,7 +11,7 @@ you never lose your work. Drafts are saved for **30 days**.
## Desktop and web
To **save a draft**, simply close the compose box. You can hit `Esc`, click
-the in the upper right corner of the
+the in the upper right corner of the
compose box, or click on an empty part of the app.
To **view your drafts**, click on `Drafts` at the bottom of the screen.
diff --git a/templates/zerver/help/view-someones-profile.md b/templates/zerver/help/view-someones-profile.md
index e3ffe0eeb6..f5d90958ff 100644
--- a/templates/zerver/help/view-someones-profile.md
+++ b/templates/zerver/help/view-someones-profile.md
@@ -16,7 +16,7 @@ were last active, and any
1. Hover over a user's name in the right sidebar.
-1. Click on the down chevron () to
+1. Click on the down chevron () to
the right of their name.
1. Click **View user profile**.
diff --git a/templates/zerver/help/zulip-glossary.md b/templates/zerver/help/zulip-glossary.md
index 58322c0788..e6021b2093 100644
--- a/templates/zerver/help/zulip-glossary.md
+++ b/templates/zerver/help/zulip-glossary.md
@@ -29,13 +29,13 @@ that can help you compose your message, such as the **Emojis**, **Attach files**
**Customization** is the process of modifying Zulip's settings to fit a user's
set of personal preferences. Users can customize their Zulip settings by
-clicking the cog () icon in the top right
+clicking the cog () icon in the top right
corner of the right sidebar and choose **Settings** from the dropdown menu.
### down chevron
A **down chevron** is a small downward-facing arrow () icon next to a message’s
+class="fa fa-chevron-down">) icon next to a message’s
[timestamp](#timestamp) that appears upon hover, offering contextual options
when clicked on, such as **View source**, **Reply**, **Collapse**,
**Mute [this topic]**, and **Link to this conversation**.
@@ -46,7 +46,7 @@ An **emoji** is a small image used to express an idea or emotion in a
conversation. Emojis can be included in Zulip messages by enclosing an emoji
phrase (a complete list of emojis can be found
[here](http://www.webpagefx.com/tools/emoji-cheat-sheet/)) in colons or clicking
-the **smiley face** () icon below the
+the **smiley face** () icon below the
[compose box](#compose-box).
### emoji reaction
@@ -84,7 +84,7 @@ messages to the user's [subscribed](#subscribing) [streams](#stream) and all of
the user's private messages in chronological order, excluding messages to muted
streams and topics. This view is accessible by
clicking the **All messages** link, Zulip logo in the upper left sidebar, home () icon to the left of the search bar, or pressing
+class="fa fa-home">) icon to the left of the search bar, or pressing
the escape key.
### integration
@@ -117,7 +117,7 @@ as if a user is away from the keyboard or busy.
If enabled by an administrator, users can utilize **message editing** for a few
minutes after posting a message to edit the content of their recently-posted
message by hovering to the right of their message's [timestamp](#timestamp) and
-clicking the pencil () icon that appears.
+clicking the pencil () icon that appears.
Zulip labels edited messages with **(EDITED)** next to the username of the
message writer.
@@ -195,7 +195,7 @@ private message recipient list, at the top of a group of messages.
Zulip allows users to mark any important messages they receive as **starred** by
hovering over the area next to the message's [timestamp](#timestamp) and
-clicking the star () icon that appears. A
+clicking the star () icon that appears. A
user can easily access messages they’ve starred through the **Starred messages**
link in the left sidebar or use **is:starred** as a [filter](#filter) or a
search constraint.
diff --git a/templates/zerver/portico-header-dropdown.html b/templates/zerver/portico-header-dropdown.html
index 264341b306..6c7d9d9522 100644
--- a/templates/zerver/portico-header-dropdown.html
+++ b/templates/zerver/portico-header-dropdown.html
@@ -6,14 +6,14 @@
-
-
+
Go home
-
{% include 'zerver/app/logout.html' %}
-
+
Log out
diff --git a/zerver/lib/bugdown/help_relative_links.py b/zerver/lib/bugdown/help_relative_links.py
index b98adf584b..164997b6db 100644
--- a/zerver/lib/bugdown/help_relative_links.py
+++ b/zerver/lib/bugdown/help_relative_links.py
@@ -27,7 +27,7 @@ gear_info = {
gear_instructions = """
1. From your desktop, click on the **gear**
- () in the upper right corner.
+ () in the upper right corner.
1. Select %(item)s.
"""
@@ -47,7 +47,7 @@ stream_info = {
stream_instructions_no_link = """
1. From your desktop, click on the **gear**
- () in the upper right corner.
+ () in the upper right corner.
1. Click **Manage streams**.
"""
diff --git a/zerver/lib/bugdown/help_settings_links.py b/zerver/lib/bugdown/help_settings_links.py
index e6b9d0fca5..3f76fd0f78 100644
--- a/zerver/lib/bugdown/help_settings_links.py
+++ b/zerver/lib/bugdown/help_settings_links.py
@@ -51,7 +51,7 @@ link_mapping = {
settings_markdown = """
1. From your desktop, click on the **gear**
- () in the upper right corner.
+ () in the upper right corner.
1. Select **%(setting_type_name)s**.