diff --git a/source/_docs/configuration/customizing-devices.markdown b/source/_docs/configuration/customizing-devices.markdown
index 0498be31097..53c452358f2 100644
--- a/source/_docs/configuration/customizing-devices.markdown
+++ b/source/_docs/configuration/customizing-devices.markdown
@@ -3,16 +3,16 @@ title: "Customizing entities"
 description: "Simple customization for entities."
 ---
 
-## Changing the entity_id
+## Changing the entity ID
 
-You can use the UI to change the `entity_id` and friendly name of supported entities. To do this:
+You can use the UI to change the entity ID and friendly name of supported entities. To do this:
 
 1. Select the entity, either from the frontend or by clicking the info button next to the entity in the Developer Tools "States" tab.
-2. Click on the cog in the right corner of the entity's dialog
+2. Click on the cog icon in the right corner of the entity's dialog
 3. Enter the new name or the new entity ID (remember not to change the domain of the entity - the part before the `.`)
 4. Select *Save*
 
-If your entity is not supported, or you cannot customize what you need via this method, please see below for more options:
+If your entity is not supported, or you cannot customize what you need via this method, please see below for more options.
 
 ## Customizing entities
 
diff --git a/source/_faq/unique_id.markdown b/source/_faq/unique_id.markdown
index 346000177c2..daaf22ef890 100644
--- a/source/_faq/unique_id.markdown
+++ b/source/_faq/unique_id.markdown
@@ -34,6 +34,6 @@ Typically, you'll see this when you create entities manually using YAML, but it
 - Entity with a unique ID: Entity ID can be adjusted freely (as long as it follows the format `<domain>.<id>` and does not result in duplicates in your Home Assistant). Keep in mind that if you change the entity ID, you also need to update the references, e.g., in automations and dashboards.<br>
 - Entity without a unique ID: Entity ID is considered a fixed, static identifier and cannot be changed.
 
-If your user profile has the "Advanced Mode" activated, you will also see the second paragraph in the popup with a link to the [customization user interface](/docs/configuration/customizing-devices/#customization-using-the-ui) for this specific entity, which offers some customization options.
+In case your entity has no unique ID and therefore cannot be changed through the UI, there are some [manual customization options](/docs/configuration/customizing-devices) directly through YAML files.
 
 In case you want to read more about unique IDs, head over to this [developer documentation page](https://developers.home-assistant.io/docs/entity_registry_index/).
diff --git a/source/images/faq/faq_no_unique_id.jpg b/source/images/faq/faq_no_unique_id.jpg
index 0acc7c0226f..2affcc675cb 100644
Binary files a/source/images/faq/faq_no_unique_id.jpg and b/source/images/faq/faq_no_unique_id.jpg differ