diff --git a/source/_docs/automation/editor.markdown b/source/_docs/automation/editor.markdown
index 3107691e192..ec7fc6a8da9 100644
--- a/source/_docs/automation/editor.markdown
+++ b/source/_docs/automation/editor.markdown
@@ -1,42 +1,47 @@
 ---
-title: "Automation editor"
+title: "Using the Automation editor"
 description: "Instructions on how to use the automation editor."
 ---
 
-The automation editor is an easy way of creating and editing automations from the UI. This page uses the [Random sensor](/integrations/random#sensor) as an example, though any other sensor with a numeric value can be used as well.
+The automation editor is an easy way of creating and editing automations from the UI. In this procedure, we are going to create a new automation from scratch, using a "random" sensor for demonstration purposes. You can do this with any of your sensors that has a numeric value.
 
-From the UI, choose **{% my config %}** which is located in the sidebar, then click on **{% my automations %}** to go to the automation editor. Press the **Create Automation** button in the lower right corner to get started. You can create an automation based on a [blueprint](/docs/automation/using_blueprints/) or start from scratch. Select **Create new automation**.
+1. Go to {% my automations title="**Settings** > **Automations & Scenes**" %} and in the lower right corner, select the **Create Automation** button.
+   - For this tutorial, select **Create new automation**.
 
-![Create automation dialogue box](/images/docs/automation-editor/create-automation.png)
+  ![Create automation dialogue box](/images/docs/automation-editor/create-automation.png)
 
-Click on the **Add Trigger** button and select **Numeric state**.
+2. Select **Add Trigger** > **Entity** and select **Numeric state**.
 
-![Add trigger](/images/docs/automation-editor/add-trigger-to-automation.png)
+  ![Add trigger](/images/docs/automation-editor/add-trigger-to-automation.png)
 
-If the value of the sensor is greater than 10, then the automation should trigger.
+   - In this example, If the value of the sensor is greater than 10, then the automation should trigger.
 
-![Automation trigger](/images/docs/automation-editor/new-trigger.png)
+   ![Automation trigger](/images/docs/automation-editor/new-trigger.png)
 
-Click on the **Add Action** button and select **Call service**.
+3. Select **Add Action** > **Other actions** and select **Call service**.
 
-![Add trigger](/images/docs/automation-editor/new-action.png)
+    ![Add trigger](/images/docs/automation-editor/new-action.png)
 
-The action for this automation creates a [persistent notification](/integrations/persistent_notification/).
+    - The action for this automation creates a [persistent notification](/integrations/persistent_notification/).
+    - As the message we want a simple text that is shown as part of the notification.
 
-![Automation action](/images/docs/automation-editor/send-notification.png)
+        ```yaml
+        message: Sensor value greater than 10
+        ```
 
-As the message we want a simple text that is shown as part of the notification.
+     ![Automation action](/images/docs/automation-editor/send-notification.png)
 
-```yaml
-message: Sensor value greater than 10
-```
+4. Select the **Save** button, give your automation a meaningful name and select **Save** again.
 
- Press the **Save** button, and the save dialogue will appear. Give your automation a meaningful name and press the **Save** button again.
-
-![New automation editor](/images/docs/automation-editor/new-automation.png)
+    ![New automation editor](/images/docs/automation-editor/new-automation.png)
 
 Automations created or edited via the user interface are activated immediately after saving the automation. Read the documentation for [Automating Home Assistant](/getting-started/automation/) to learn more about automations.
 
 ## Troubleshooting missing automations
 
 When you're creating automations using the GUI and they don't appear in the UI, make sure that you add back `automation: !include automations.yaml` from the default configuration to your `configuration.yaml`.
+
+## Related topics
+
+- [Automating Home Assistant](/getting-started/automation/)
+- [Persistent notifications](/integrations/persistent_notification/)
diff --git a/source/images/docs/automation-editor/add-trigger-to-automation.png b/source/images/docs/automation-editor/add-trigger-to-automation.png
index aecd2455d78..08ad4c06b55 100644
Binary files a/source/images/docs/automation-editor/add-trigger-to-automation.png and b/source/images/docs/automation-editor/add-trigger-to-automation.png differ
diff --git a/source/images/docs/automation-editor/new-action.png b/source/images/docs/automation-editor/new-action.png
index 26dc6edc9e2..f83178f2b6c 100644
Binary files a/source/images/docs/automation-editor/new-action.png and b/source/images/docs/automation-editor/new-action.png differ