diff --git a/templates/zerver/help/change-the-topic-of-a-message.md b/templates/zerver/help/change-the-topic-of-a-message.md
index 87e4860311..cb2632430d 100644
--- a/templates/zerver/help/change-the-topic-of-a-message.md
+++ b/templates/zerver/help/change-the-topic-of-a-message.md
@@ -2,44 +2,42 @@
 
 You can easily change the topic of a message by following the following steps.
 
-1. Locate the message that you want edit. Hover over the message's timestamp on the right-hand side to reveal a star (![star](/static/images/help/star.png)), chevron (![chevron](/static/images/help/chevron.png)), and pencil (![pencil](/static/images/help/pencil.png)) icon.
+{!message-actions.md!} the pencil (![pencil](/static/images/help/pencil.png)) icon to begin editing your message.
 
-    ![Message hover timestamp](/static/images/help/message-hover.png)
+2. In the field labeled **Topic**, enter the new topic name for your message.
 
-2. Click on the pencil (![pencil](/static/images/help/pencil.png)) icon to begin editing your message. In the field labeled **Topic**, enter the new topic name for your message.
-
-    ![Message topic edit](/static/images/help/topic-edit.png)
-
-3. Once you begin typing in the **Topic** field, you will notice that a dropdown appears to the right of the **Topic** field with the **Change only this message topic** option selected by default.
-
-    ![Message topic edit dropdown](/static/images/help/edit-topic-dropdown.png)
-
-4. Click the dropdown to view all options for editing your message's topic.
-
-    ![Message topic edit dropdown](/static/images/help/edit-topic-dropdown-options.png)
+3. Once you begin typing in the **Topic** field, you will notice that a dropdown
+appears to the right of the **Topic** field with the **Change only this message topic**
+option selected by default. Click the dropdown to view all options for editing
+your message's topic.
 
     * **Change only this message topic**
 
         This option only changes the topic of the message that you have selected.
 
-        You may want to select this option if you sent the message to the wrong topic.
+        !!! tip ""
+            You may want to select this option if you sent the message to the
+            wrong topic.
 
     * **Change later messages to this topic**
 
         This option changes the topic of the selected message as well as the topic of any messages under the same topic that were sent after the selected message.
 
-        You may want to select this option if you feel that some messages have gone off-topic.
+        !!! tip ""
+            You may want to select this option if you feel that some of your
+            messages have gone off-topic.
 
     * **Change previous and following messages to this topic**
 
         This option changes the topic of the selected message as well as any messages under the same topic that were sent before and after the selected message.
 
-        You may want to select this option to change the topic for all messages with the same topic.
+        !!! tip ""
+            You may want to select this option to change the topic for all
+            messages with the same topic.
 
-5. After choosing the option you desire from the dropdown, click the blue **Save** button under the box containing the message's contents.
+5. After choosing your desired option from the dropdown, click the **Save**
+button under the box containing the message's contents.
 
-    ![Message topic edit save](/static/images/help/edit-topic-save.png)
-
-6. After clicking **Save**, the topic of your edited message(s) will change, and the message(s) will be marked with **(EDITED)**, confirming the success of the topic change.
-
-    ![Message topic edit success](/static/images/help/edit-topic-success.png)
+6. After clicking **Save**, the topic of your edited message(s) will change, and
+the message(s) will be marked with **(EDITED)**, confirming the success of the
+topic change.