diff --git a/src/locale_EN.h b/src/locale_EN.h
index 4207dbed5..af42f949e 100644
--- a/src/locale_EN.h
+++ b/src/locale_EN.h
@@ -104,7 +104,6 @@ MAKE_PSTR(mark_interval_fmt, "Mark interval = %lus")
 MAKE_PSTR(wifi_ssid_fmt, "WiFi SSID = %s")
 MAKE_PSTR(wifi_password_fmt, "WiFi Password = %S")
 MAKE_PSTR(mqtt_heartbeat_fmt, "MQTT Heartbeat is %s")
-MAKE_PSTR(mqtt_format_fmt, "MQTT Format is %d")
 MAKE_PSTR(cmd_optional, "[cmd]")
 MAKE_PSTR(deep_optional, "[deep]")
 MAKE_PSTR(tx_mode_fmt, "Tx mode = %d")
@@ -131,3 +130,125 @@ MAKE_PSTR(new_password_prompt1, "Enter new password: ")
 MAKE_PSTR(new_password_prompt2, "Retype new password: ")
 MAKE_PSTR(password_prompt, "Password: ")
 MAKE_PSTR(unset, "<unset>")
+
+// HA icons
+MAKE_PSTR(icontemperature, "mdi:coolant-temperature")
+MAKE_PSTR(iconpercent, "mdi:sine-wave")
+
+// boiler
+MAKE_PSTR(heatingActive, "Heating Active")
+MAKE_PSTR(tapwaterActive, "Warm water/DHW Active")
+MAKE_PSTR(serviceCode, "Service Code")
+MAKE_PSTR(serviceCodeNumber, "Service Code Number")
+MAKE_PSTR(wWSelTemp, "Warm water selected temperature")
+MAKE_PSTR(wWSetTemp, "Warm water set temperature")
+MAKE_PSTR(wWDisinfectionTemp, "Warm water disinfection temperature")
+MAKE_PSTR(selFlowTemp, "Selected flow temperature")
+MAKE_PSTR(selBurnPow, "Burner selected max power")
+MAKE_PSTR(curBurnPow, "Burner current power")
+MAKE_PSTR(pumpMod, "Pump modulation")
+MAKE_PSTR(pumpMod2, "Heat pump modulation")
+MAKE_PSTR(wWType, "Warm water type")
+MAKE_PSTR(wWChargeType, "Warm Water charging type")
+MAKE_PSTR(wWCircPump, "Warm water circulation pump available")
+MAKE_PSTR(wWCiPuMode, "Warm water circulation pump freq")
+MAKE_PSTR(wWCirc, "Warm water circulation active")
+MAKE_PSTR(outdoorTemp, "Outside temperature")
+MAKE_PSTR(wWCurTmp, "Warm water current temperature (intern)")
+MAKE_PSTR(wWCurTmp2, "Warm water current temperature (extern)")
+MAKE_PSTR(wWCurFlow, "Warm water current tap water flow")
+MAKE_PSTR(curFlowTemp, "Current flow temperature")
+MAKE_PSTR(retTemp, "Return temperature")
+MAKE_PSTR(switchTemp, "Mixing switch temperature")
+MAKE_PSTR(sysPress, "System pressure")
+MAKE_PSTR(boilTemp, "Max boiler temperature")
+MAKE_PSTR(wwStorageTemp1, "Warm water storage temperature (intern)")
+MAKE_PSTR(wwStorageTemp2, "Warm water storage temperature (extern)")
+MAKE_PSTR(exhaustTemp, "Exhaust temperature")
+MAKE_PSTR(wWActivated, "Warm water activated")
+MAKE_PSTR(wWOnetime, "Warm water one time charging")
+MAKE_PSTR(wWDisinfecting, "Warm water disinfecting")
+MAKE_PSTR(wWCharge, "Warm water charging")
+MAKE_PSTR(wWRecharge, "Warm water recharge")
+MAKE_PSTR(wWTempOK, "Warm water temperature ok")
+MAKE_PSTR(wWActive, "Warm water active")
+MAKE_PSTR(burnGas, "Gas")
+MAKE_PSTR(flameCurr, "Flame current")
+MAKE_PSTR(heatPump, "Boiler pump")
+MAKE_PSTR(fanWork, "Fan")
+MAKE_PSTR(ignWork, "Ignition")
+MAKE_PSTR(wWHeat, "Warm water charging")
+MAKE_PSTR(heatingActivated, "Heating activated")
+MAKE_PSTR(heatingTemp, "Heating temperature setting on the boiler")
+MAKE_PSTR(pumpModMax, "Boiler circuit pump modulation max power")
+MAKE_PSTR(pumpModMin, "Boiler circuit pump modulation min power")
+MAKE_PSTR(pumpDelay, "Boiler circuit pump delay time")
+MAKE_PSTR(burnMinPeriod, "Boiler burner min period")
+MAKE_PSTR(burnMinPower, "Boiler burner min power")
+MAKE_PSTR(burnMaxPower, "Boiler burner max power")
+MAKE_PSTR(boilHystOn, "Boiler temp hysteresis on")
+MAKE_PSTR(boilHystOff, "Boiler temp hysteresis off")
+MAKE_PSTR(setFlowTemp, "Set Flow temperature")
+MAKE_PSTR(wWSetPumpPower, "Warm water pump set power")
+MAKE_PSTR(wwMixTemperature, "Warm water mix temperature")
+MAKE_PSTR(wwBufferBoilerTemperature, "Warm water buffer boiler temperature")
+MAKE_PSTR(wWStarts, "Warm water # starts")
+MAKE_PSTR(wWWorkM, "Warm water active time")
+MAKE_PSTR(setBurnPow, "Boiler burner set power")
+MAKE_PSTR(burnStarts, "Burner # starts")
+
+// solar
+MAKE_PSTR(collectorTemp, "Collector temperature (TS1)")
+MAKE_PSTR(tankBottomTemp, "Bottom temperature (TS2)")
+MAKE_PSTR(tankBottomTemp2, "Bottom temperature (TS5)")
+MAKE_PSTR(heatExchangerTemp, "Heat exchanger temperature (TS6)")
+MAKE_PSTR(solarPumpModulation, "Solar pump modulation (PS1)")
+MAKE_PSTR(cylinderPumpModulation, "Cylinder pump modulation (PS5)")
+MAKE_PSTR(pumpWorkMin, "Pump working time")
+MAKE_PSTR(energyLastHour, "Energy last hour")
+MAKE_PSTR(energyToday, "Energy today")
+MAKE_PSTR(energyTotal, "Energy total")
+MAKE_PSTR(solarPump, "Solar Pump (PS1) active")
+MAKE_PSTR(valveStatus, "Valve status")
+MAKE_PSTR(tankHeated, "Tank Heated")
+MAKE_PSTR(collectorShutdown, "Collector shutdown")
+
+// mixing
+MAKE_PSTR(ww_hc, "Warm Water Circuit")
+MAKE_PSTR(wwTemp, "Current warm water temperature")
+MAKE_PSTR(pumpStatus, "Current pump status")
+MAKE_PSTR(tempStatus, "Current temperature status")
+MAKE_PSTR(hc, "Heating Circuit")
+MAKE_PSTR(flowTemp, "Current flow temperature")
+MAKE_PSTR(flowSetTemp, "Setpoint flow temperature")
+
+// thermostat
+MAKE_PSTR(display, "Display")
+MAKE_PSTR(language, "Language")
+MAKE_PSTR(offsetclock, "Offset clock")
+MAKE_PSTR(dampedtemp, "Damped outdoor temperature")
+MAKE_PSTR(inttemp1, "Temp sensor 1")
+MAKE_PSTR(inttemp2, "Temp sensor 2")
+MAKE_PSTR(intoffset, "Offset int. temperature")
+MAKE_PSTR(minexttemp, "Min ext. temperature")
+MAKE_PSTR(building, "Building")
+MAKE_PSTR(wwmode, "Warm water mode")
+MAKE_PSTR(wwcircmode, "Warm Water circulation mode")
+
+// thermostat - per heating circuit
+MAKE_PSTR(seltemp, "Setpoint room temperature")
+MAKE_PSTR(currtemp, "Current room temperature")
+MAKE_PSTR(heattemp, "Heat temperature")
+MAKE_PSTR(comforttemp, "Comfort temperature")
+MAKE_PSTR(daytemp, "Day temperature")
+MAKE_PSTR(ecotemp, "Eco temperature")
+MAKE_PSTR(nighttemp, "Night temperature")
+MAKE_PSTR(manualtemp, "Manual temperature")
+MAKE_PSTR(holidaytemp, "Holiday temperature")
+MAKE_PSTR(nofrosttemp, "Nofrost temperature")
+MAKE_PSTR(targetflowtemp, "Target flow temperature")
+MAKE_PSTR(offsettemp, "Offset temperature")
+MAKE_PSTR(designtemp, "Design temperature")
+MAKE_PSTR(summertemp, "Summer temperature")
+MAKE_PSTR(mode, "Mode")
+MAKE_PSTR(modetype, "Mode type")