diff --git a/src/common/const.ts b/src/common/const.ts
index 0b3e70ed03..6ec749d662 100644
--- a/src/common/const.ts
+++ b/src/common/const.ts
@@ -56,6 +56,8 @@ export const FIXED_DOMAIN_ICONS = {
 
 export const FIXED_DEVICE_CLASS_ICONS = {
   current: "hass:current-ac",
+  carbon_dioxide: "mdi:molecule-co2",
+  carbon_monoxide: "mdi:molecule-co",
   energy: "hass:flash",
   humidity: "hass:water-percent",
   illuminance: "hass:brightness-5",
diff --git a/src/util/hass-attributes-util.ts b/src/util/hass-attributes-util.ts
index 1b9c521e34..95bfee3e96 100644
--- a/src/util/hass-attributes-util.ts
+++ b/src/util/hass-attributes-util.ts
@@ -40,6 +40,8 @@ const hassAttributeUtil = {
     humidifier: ["dehumidifier", "humidifier"],
     sensor: [
       "battery",
+      "carbon_dioxide",
+      "carbon_monoxide",
       "current",
       "energy",
       "humidity",