diff --git a/templates/zerver/help/add-or-invite-someone-to-a-stream.md b/templates/zerver/help/add-or-invite-someone-to-a-stream.md
index 9ddd9c493f..f325311263 100644
--- a/templates/zerver/help/add-or-invite-someone-to-a-stream.md
+++ b/templates/zerver/help/add-or-invite-someone-to-a-stream.md
@@ -5,34 +5,27 @@ You might want to add a user to a particular stream that they haven't subscribed
 You can add users to streams, both public and private, that you're subscribed to.
 
 {!subscriptions.md!}
+{!filter-streams.md!}
 
-    If you wish to see streams that you aren't subscribed to, click the **All Streams**
-tab; the tab will turn gray upon doing so.
+    !!! tip ""
+        {!all-streams.md!}
 
-1. Locate the stream that you want to add a user to in the stream browser. You can search for specific streams by entering the name of the stream in the **Filter streams** search box.
+1. Click on the stream that you want to add someone to; {!stream-settings.md!}
 
-    ![Filter streams box](/static/images/help/filter-stream.png)
+{!stream-settings-scroll.md!} **Stream membership** section. This section
+shows the usernames and emails of all users that are currently subscribed to the
+selected stream.
 
-1. Click on the stream that you want to add someone to. The right side of the stream browser, labeled **Stream settings**, will now display that settings of the stream that you've selected.
+1. Click on the input field labeled **Email address** and enter the username or
+email address of the user you want to add to the stream.
 
-    ![Stream selected](/static/images/help/stream-selected.png)
+    As you type, autocompletion suggestions will appear. You can choose to
+    select an option from the autocompletion dropdown or enter the complete
+    email address of the user.
 
-1. After making sure that your cursor is hovering over the **Streams settings** section (right half of the stream browser), scroll down to the section labeled **Stream membership**. This section shows the usernames and emails of all users that are currently subscribed to the selected stream.
+1. Once the email address is entered in the **Email address** field, click the
+**Add** button to add the user to the stream.
 
-    ![Stream membership](/static/images/help/stream-membership.png)
-
-1. Click on the box labeled **Email address** and enter the username or email address of the user you want to add to the stream.
-
-    ![Stream membership email](/static/images/help/stream-membership-email.png)
-
-1. As you type, autocompletions will appear. You can choose to select an option from the autocompletion dropdown or fully enter the email address of the user.
-
-    ![Stream membership email autocomplete](/static/images/help/stream-add-email-auto.png)
-
-1. Once the email address is entered in the **Email address** field, click the blue **Add** button to add the user to the stream.
-
-    ![Blue add button](/static/images/help/stream-blue-add.png)
-
-1. After you press the blue **Add** button, the user will be listed in the **Stream membership** section, confirming that they have been successfully added to the stream.
-
-    ![Stream add complete](/static/images/help/stream-add-complete.png)
+1. After you press the **Add** button, the user will be listed in the **Stream
+membership** section, confirming that they have been successfully added to the
+stream.