diff --git a/source/_integrations/template.markdown b/source/_integrations/template.markdown
index 560db1ec9b8..10356149d4b 100644
--- a/source/_integrations/template.markdown
+++ b/source/_integrations/template.markdown
@@ -148,10 +148,6 @@ binary_sensor:
   required: false
   type: map
   keys:
-    icon:
-      description: Defines a template for the icon of the sensor.
-      required: false
-      type: template
     picture:
       description: Defines a template for the entity picture of the sensor.
       required: false
@@ -229,15 +225,19 @@ select:
   type: map
   keys:
     name:
-      description: Defines a template to get the name of the sensor.
+      description: Defines a template to get the name of the entity.
       required: false
       type: template
     unique_id:
-      description: An ID that uniquely identifies this sensor. Will be combined with the unique ID of the configuration block if available. This allows changing the `name`, `icon` and `entity_id` from the web interface.
+      description: An ID that uniquely identifies this entity. Will be combined with the unique ID of the configuration block if available. This allows changing the `name`, `icon` and `entity_id` from the web interface.
       required: false
       type: string
+    icon:
+      description: Defines a template for the icon of the entity.
+      required: false
+      type: template
     availability:
-      description: Defines a template to get the `available` state of the component. If the template returns `true`, the device is `available`. If the template returns any other value, the device will be `unavailable`. If not configured, the component will always be `available`.
+      description: Defines a template to get the `available` state of the entity. If the template returns `true`, the device is `available`. If the template returns any other value, the device will be `unavailable`. If not configured, the component will always be `available`.
       required: false
       type: template
       default: true