diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index d98eae9f..a08031cd 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -462,15 +462,15 @@ class HomeAssistant extends Extension {
                 },
                 smoke_density: {icon: 'mdi:google-circles-communities', state_class: 'measurement'},
                 gas_density: {icon: 'mdi:google-circles-communities', state_class: 'measurement'},
-                pm25: {icon: 'mdi:air-filter', state_class: 'measurement'},
-                pm10: {icon: 'mdi:air-filter', state_class: 'measurement'},
+                pm25: {device_class: 'pm25', state_class: 'measurement'},
+                pm10: {device_class: 'pm10', state_class: 'measurement'},
                 voc: {icon: 'mdi:air-filter', state_class: 'measurement'},
-                aqi: {icon: 'mdi:air-filter', state_class: 'measurement'},
+                aqi: {device_class: 'aqi', state_class: 'measurement'},
                 hcho: {icon: 'mdi:air-filter', state_class: 'measurement'},
                 requested_brightness_level: {enabled_by_default: false, icon: 'mdi:brightness-5'},
                 requested_brightness_percent: {enabled_by_default: false, icon: 'mdi:brightness-5'},
-                eco2: {icon: 'mdi:molecule-co2', state_class: 'measurement'},
-                co2: {icon: 'mdi:molecule-co2', state_class: 'measurement'},
+                eco2: {device_class: 'carbon_dioxide', state_class: 'measurement'},
+                co2: {device_class: 'carbon_dioxide', state_class: 'measurement'},
                 local_temperature: {device_class: 'temperature', state_class: 'measurement'},
                 x_axis: {icon: 'mdi:axis-x-arrow'},
                 y_axis: {icon: 'mdi:axis-y-arrow'},