diff --git a/templates/zerver/help/star-a-message.md b/templates/zerver/help/star-a-message.md
index 1966e247dc..3a5543d9d0 100644
--- a/templates/zerver/help/star-a-message.md
+++ b/templates/zerver/help/star-a-message.md
@@ -1,23 +1,16 @@
 # Starring a message
-Starring messages is a good way to keep track of important messages, such as tasks you need to go back to, or documents you reference often.
-### Star a message
-You can star a message by hovering over any message. The timestamp of the message should be replaced with three context buttons while hovering, one of which is a star. Click on this to star the message.
+Starring messages is a good way to keep track of important messages, such as
+tasks you need to go back to or documents you reference often.
 
-![Message example](/static/images/help/starring-messages-unstarred.png)
+{!message-actions.md!} the star (![star](/static/images/help/star.png)) icon.
 
-When a message is starred, a small green star appears next to the timestamp of the message.
+2. After starring a message, a green star appears next to the timestamp of the
+message, confirming the success of your starring of the message.
 
-![Message example](/static/images/help/starring-messages-starred.png)
-
-### Unstar a message
-Click on the green star to unstar a message, returning it to being unfilled.
-
-### View a starred message
-You can view all messages you've starred by filtering with the term `is:starred`. This term can be combined with any other filter or search term.
-
-![Message example](/static/images/help/starring-messages-filtering.png)
-
-You can also click the "Starred Messages" option on the sidebar to filter to only starred messages.
-
-![Message example](/static/images/help/starring-messages-view-starred.png)
+    You can click on the green star next to a starred message to unstar the
+    message.
 
+!!! tip ""
+    You can narrow your view to show all starred messages by searching for
+    messages with the search operator `is:starred` or clicking on the
+    **Starred Messages** option on the left sidebar.