diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md
index 90bfcfd9e6..665007e55d 100644
--- a/help/include/sidebar_index.md
+++ b/help/include/sidebar_index.md
@@ -104,7 +104,7 @@
* [Emoji reactions](/help/emoji-reactions)
* [View your mentions](/help/view-your-mentions)
* [Star a message](/help/star-a-message)
-* [View and browse images](/help/view-and-browse-images)
+* [View images and videos](/help/view-and-browse-images)
* [View messages sent by a user](/help/view-messages-sent-by-a-user)
* [Link to a message or conversation](/help/link-to-a-message-or-conversation)
* [Searching for messages](/help/search-for-messages)
diff --git a/help/manage-your-uploaded-files.md b/help/manage-your-uploaded-files.md
index a5eeb64fbf..25c07bf062 100644
--- a/help/manage-your-uploaded-files.md
+++ b/help/manage-your-uploaded-files.md
@@ -63,4 +63,4 @@ You can sort your uploaded files by name, upload date, message ID, and size.
## Related articles
* [Share and upload files](/help/share-and-upload-files)
-* [View and browse images](/help/view-and-browse-images)
+* [View images and videos](/help/view-and-browse-images)
diff --git a/help/search-for-messages.md b/help/search-for-messages.md
index 992652431a..0ea3b52299 100644
--- a/help/search-for-messages.md
+++ b/help/search-for-messages.md
@@ -77,12 +77,13 @@ Zulip offers the following filters based on the location of the message.
* `has:link`: Search messages that contain URLs.
* `has:attachment`: Search messages that contain an [uploaded
file](/help/share-and-upload-files).
-* `has:image`: Search messages that contain an uploaded image or link to an image.
+* `has:image`: Search messages that contain uploaded or linked images or videos.
!!! tip ""
- You can also [view](/help/manage-your-uploaded-files) all the files you have uploaded
- or [browse](/help/view-and-browse-images) all the images in the current view.
+ You can also [view](/help/manage-your-uploaded-files) all the files you
+ have uploaded or [browse](/help/view-and-browse-images) all the images and
+ videos in the current view.
### Search your important messages
diff --git a/help/share-and-upload-files.md b/help/share-and-upload-files.md
index 6d8ecde08a..73ba177fb7 100644
--- a/help/share-and-upload-files.md
+++ b/help/share-and-upload-files.md
@@ -4,9 +4,9 @@ Zulip supports attaching multiple files to messages, including images,
documents, sound, and video. You can edit the names of the files others see
after you upload them.
-Zulip will automatically generate a **thumbnail** for each file when you send
-the message, if it can. Image thumbnails will be shown directly in the message,
-and you can click on a thumbnail to [view the full image](/help/view-and-browse-images).
+For images and videos, a small preview will be shown directly in the message.
+People reading the message can click on the preview to
+[view the full-size image or video](/help/view-and-browse-images).
## Uploading files
@@ -125,5 +125,5 @@ This limit can be changed by the server administrator.
## Related articles
* [Manage your uploaded files](/help/manage-your-uploaded-files)
-* [View and browse images](/help/view-and-browse-images)
+* [View images and videos](/help/view-and-browse-images)
* [Animated GIFs](/help/animated-gifs-from-giphy)
diff --git a/help/view-and-browse-images.md b/help/view-and-browse-images.md
index 3e78e15d03..f5322eabc0 100644
--- a/help/view-and-browse-images.md
+++ b/help/view-and-browse-images.md
@@ -1,26 +1,37 @@
-# View and browse images
+# View images and videos
-When someone pastes or attaches an image to a message, Zulip shows a small
-preview. Click on the image preview to open the **image viewer**.
+Zulip shows previews of attached images and videos, unless previews are
+[disabled](/help/allow-image-link-previews) in your organization. You
+can click on a preview to view an image in more detail, or to play a
+video. Zulip also makes it convenient to browse all images and videos
+attached to messages in your current view.
-In the image viewer, you can:
+## Using the image viewer
-* Zoom in and out of the image
+{start_tabs}
-* Click and drag the image
+{tab|desktop-web}
-* **Reset zoom** so that the image is recentered and its original size
+1. Click an image preview to open the **image viewer**.
-* **Open** the image in a new browser tab
+1. You can interact with the image.
-* **Download** the image
+ * Zoom in and out of the image
-* Browse other images in the current view. For example, if you're in a
- stream view, the image browser will show all the images from that stream. If
- you do a [search](/help/search-for-messages), the image browser will show
- all images in messages that matched that search.
+ * Click and drag the image
-Exit the image viewer by clicking anywhere outside the image.
+ * **Reset zoom** so that the image is recentered and back to its original size
+
+ * **Open** the image in a new browser tab if you are using the Zulip web app
+
+ * **Download** the image
+
+1. Click anywhere outside the image to close the image viewer once you are done.
+
+!!! tip ""
+
+ You can click on the file name to download an image rather than viewing it
+ in the Zulip app.
!!! keyboard_tip ""
@@ -28,9 +39,30 @@ Exit the image viewer by clicking anywhere outside the image.
Z and Z to zoom in and out of the image. Use
V or Esc to **close** the image viewer.
-## Troubleshooting
+{end_tabs}
-To open the image viewer, you must click on the image preview, not the file name.
+## Using the image browser
+
+In the Zulip desktop or web app, you can browse the images in the current view.
+For example, if you're in a conversation view, the image browser will show all
+the images from that stream. If you do a [search](/help/search-for-messages),
+the image browser will show all images in messages that matched that search.
+
+{start_tabs}
+
+{tab|desktop-web}
+
+1. Click an image preview or use V to open the **image viewer**.
+
+1. You can click an image or use the left and right buttons at the bottom of
+ the viewer to browse images.
+
+!!! keyboard_tip ""
+
+ Use ← and →
+ to scroll through the images.
+
+{end_tabs}
## Related articles