diff --git a/source/_dashboards/sections.markdown b/source/_dashboards/sections.markdown
index 20ec4612f8f..a96f998d849 100644
--- a/source/_dashboards/sections.markdown
+++ b/source/_dashboards/sections.markdown
@@ -64,7 +64,7 @@ Once you have created a sections view, you can populate it with sections and car
 
 ## Deleting a section
 
-1. To delete a section, go to the dashboard and in the top right corner, select the pencil icon.
+1. To delete a section, go to the dashboard and in the top right corner, select the edit {% icon "mdi:edit" %} button.
 2. Open the view with the section you want to delete.
 3. Select the delete {% icon "mdi:trash" %} button.
 
@@ -72,7 +72,7 @@ Once you have created a sections view, you can populate it with sections and car
 
 In the sections view, you can rearrange sections and cards by dragging them to a new location. This is not yet possible in other views.
 
-1. To edit your dashboard, in the top right corner, select the pencil icon.
+1. To edit your dashboard, in the top right corner, select the edit {% icon "mdi:edit" %} button.
 2. To rearrange sections, hold the move {% icon "mdi:cursor-move" %} button and move the card.
 
     <p class='img'>
diff --git a/source/_docs/organizing/areas.markdown b/source/_docs/organizing/areas.markdown
index ab0788e23e6..eaa6d032f58 100644
--- a/source/_docs/organizing/areas.markdown
+++ b/source/_docs/organizing/areas.markdown
@@ -44,7 +44,7 @@ Follow these steps to create a new area from the **Areas** view.
 If an area has not yet been assigned to a floor, it is shown in the **Unassigned areas** section. Follow these steps to assign an area to a floor.
 
 1. Go to {% my areas title="**Settings** > **Areas, labels & zones**" %} and select **Create area**.
-2. On the area card, select the pencil icon.
+2. On the area card, select the edit {% icon "mdi:edit" %} button.
 3. In the dialog, select the floor and add labels, if you like.
 
 ## Assigning an area to multiple items
@@ -64,7 +64,7 @@ You can assign an area to multiple items at once in the automation, scene, scrip
 
 Follow these steps to edit an area.
 
-1. Go to {% my areas title="**Settings** > **Areas, labels & zones**" %} and on the area card, select the pencil icon.
+1. Go to {% my areas title="**Settings** > **Areas, labels & zones**" %} and on the area card, select the edit {% icon "mdi:edit" %} button.
 2. In the dialog, adjust the area details you want to change:
    - Edit the area **Name**.
    - Add an icon (We use [Material icons](https://pictogrammers.com/library/mdi/)).
diff --git a/source/_docs/organizing/labels.markdown b/source/_docs/organizing/labels.markdown
index ab700f94660..8722042a6a3 100644
--- a/source/_docs/organizing/labels.markdown
+++ b/source/_docs/organizing/labels.markdown
@@ -38,7 +38,7 @@ Follow these steps to apply a label
 
 1. To apply a label to an area:
    - Go to {% my areas title="**Settings** > **Areas, labels & zones**" %}.
-   - On the area card, select the pencil icon.
+   - On the area card, select the edit {% icon "mdi:edit" %} button.
    - Select one or more labels or select **Add new label** to create a new one.
 2. To apply a label to a device, entity, or helper:
    - Go to **{% my integrations title="Settings > Devices & Services" %}** and open the respective tab.
diff --git a/source/_includes/dashboard/edit_dashboard.md b/source/_includes/dashboard/edit_dashboard.md
index 42da726cd25..1053b8b3cdf 100644
--- a/source/_includes/dashboard/edit_dashboard.md
+++ b/source/_includes/dashboard/edit_dashboard.md
@@ -4,7 +4,7 @@
 
 To add the {{ title | downcase }} to your user interface:
 
-1. In the top right of the screen, select the pencil icon.
+1. In the top right of the screen, select the edit {% icon "mdi:edit" %} button.
    - 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.
diff --git a/source/_integrations/matter.markdown b/source/_integrations/matter.markdown
index 1eedde1cb58..f5a0ac8ae8b 100644
--- a/source/_integrations/matter.markdown
+++ b/source/_integrations/matter.markdown
@@ -186,7 +186,7 @@ This guide describes how to add a new device. This will use the Bluetooth connec
    - If you're adding a test board (e.g. ESP32 running the example apps) and commissioning fails, you might need to take some actions in the Google Developer console, have a look at any instructions for your test device.
    - Once the process is complete, select **Done**.
 5. To view the device details, go to {% my integrations title="**Settings** > **Devices & Services**" %} and select the **Matter** integration.
-6. By default, the device gets a factory specified name. To rename it, on the device page, select the pencil to edit and rename the device.
+6. By default, the device gets a factory specified name. To rename it, on the device page, select the pencil {% icon "mdi:edit" %} to edit and rename the device.
    ![image](/images/integrations/matter/matter-android-rename.png)
 7. Your device is now ready to use.