diff --git a/source/_includes/dashboard/edit_dashboard.md b/source/_includes/dashboard/edit_dashboard.md
index d826f6906b9..1817057c574 100644
--- a/source/_includes/dashboard/edit_dashboard.md
+++ b/source/_includes/dashboard/edit_dashboard.md
@@ -3,6 +3,10 @@
 {% capture title %}{{ include.title | default: page.title }}{% endcapture %}
 
 To add the {{ title | downcase }} to your user interface:
-1. In the top right of the screen, select the three dots menu and then select **Edit dashboard**.
-   - By editing the dashboard, you are taking over control of this dashboard. This means that it is no longer automatically updated when new dashboard elements become available. To continue, in the dialog, select **Take control**.
-2. In the bottom right corner, select the **Add card** button  and select from the card picker.
+
+1. In the top right of the screen, select the pencil icon.
+   - If this is your first time editing a dashboard, the **Edit dashboard** dialog appears.
+     - By editing the dashboard, you are taking over control of this dashboard.
+     - This means that it is no longer automatically updated when new dashboard elements become available.
+     - To continue, in the dialog, select the three dots menu, then select **Take control**.
+2. In the bottom right corner, select the **Add card** button and select from the card picker.
diff --git a/source/getting-started/onboarding_dashboard.markdown b/source/getting-started/onboarding_dashboard.markdown
index 550e03dda2f..311e9448feb 100644
--- a/source/getting-started/onboarding_dashboard.markdown
+++ b/source/getting-started/onboarding_dashboard.markdown
@@ -46,7 +46,7 @@ The procedure below is optional. The idea is to learn some basics on changing th
    - You now see the forecast card on the dashboard.
 
 7. Now let's delete the other weather card.
-   - In the top right corner, select the three-dot menu, then select **Edit dashboard**.
+   - In the top right corner, select the pencil.
    ![Dashboard - edit the dashboard](/images/getting-started/onboarding_edit_dashboard_01.png)
    - On the card, select the three-dot menu and select **Delete**.
    ![Dashboard - delete card](/images/getting-started/onboarding_dashboard_delete_card.png)
diff --git a/source/images/getting-started/dashboard-take-control.png b/source/images/getting-started/dashboard-take-control.png
index e6868ad7260..1d86d4ac817 100644
Binary files a/source/images/getting-started/dashboard-take-control.png and b/source/images/getting-started/dashboard-take-control.png differ
diff --git a/source/images/getting-started/lovelace.png b/source/images/getting-started/lovelace.png
index f7e33107e81..e265d86dcd8 100644
Binary files a/source/images/getting-started/lovelace.png and b/source/images/getting-started/lovelace.png differ
diff --git a/source/images/getting-started/onboarding_dashboard_01.png b/source/images/getting-started/onboarding_dashboard_01.png
index 6a1f4d0dc4e..b2caafee87a 100644
Binary files a/source/images/getting-started/onboarding_dashboard_01.png and b/source/images/getting-started/onboarding_dashboard_01.png differ
diff --git a/source/images/getting-started/onboarding_edit_dashboard_01.png b/source/images/getting-started/onboarding_edit_dashboard_01.png
index 6ca5e50328f..a50af656a86 100644
Binary files a/source/images/getting-started/onboarding_edit_dashboard_01.png and b/source/images/getting-started/onboarding_edit_dashboard_01.png differ