diff --git a/lib/homeassistant.js b/lib/homeassistant.js
index 05160a76..54062261 100644
--- a/lib/homeassistant.js
+++ b/lib/homeassistant.js
@@ -75,7 +75,7 @@ const configurations = {
         object_id: 'illuminance',
         discovery_payload: {
             unit_of_measurement: 'lx',
-            icon: 'mdi:theme-light-dark',
+            device_class: 'illuminance',
             value_template: '{{ value_json.illuminance }}',
             json_attributes: ['battery', 'voltage'],
         },
@@ -85,7 +85,7 @@ const configurations = {
         object_id: 'humidity',
         discovery_payload: {
             unit_of_measurement: '%',
-            icon: 'mdi:water-percent',
+            device_class: 'humidity',
             value_template: '{{ value_json.humidity }}',
             json_attributes: ['battery', 'voltage'],
         },
@@ -95,7 +95,7 @@ const configurations = {
         object_id: 'temperature',
         discovery_payload: {
             unit_of_measurement: '°C',
-            icon: 'mdi:temperature-celsius',
+            device_class: 'temperature',
             value_template: '{{ value_json.temperature }}',
             json_attributes: ['battery', 'voltage'],
         },
@@ -104,8 +104,8 @@ const configurations = {
         type: 'sensor',
         object_id: 'pressure',
         discovery_payload: {
-            unit_of_measurement: 'Pa',
-            icon: 'mdi:speedometer',
+            unit_of_measurement: 'hPa',
+            device_class: 'pressure',
             value_template: '{{ value_json.pressure }}',
             json_attributes: ['battery', 'voltage'],
         },