diff --git a/interface/src/project/DeviceIcon.tsx b/interface/src/project/DeviceIcon.tsx
index ec8910487..27d2cabe2 100644
--- a/interface/src/project/DeviceIcon.tsx
+++ b/interface/src/project/DeviceIcon.tsx
@@ -19,7 +19,8 @@ interface DeviceIconProps {
 const DeviceIcon: FC<DeviceIconProps> = ({ type }) => {
   switch (type) {
     case 'Boiler':
-      return <CgSmartHomeBoiler />;
+    case 'Heatsource':
+        return <CgSmartHomeBoiler />;
     case 'Sensor':
       return <MdOutlineSensors />;
     case 'Solar':
diff --git a/src/device_library.h b/src/device_library.h
index 3664d54b5..db60e9a4e 100644
--- a/src/device_library.h
+++ b/src/device_library.h
@@ -144,7 +144,7 @@
 {248, DeviceType::HEATPUMP, "Hybrid Manager HM200", DeviceFlags::EMS_DEVICE_FLAG_NONE},
 
 // Heatsource - 0x60
-{228, DeviceType::HEATSOURCE, "Alternative Heatsource", DeviceFlags::EMS_DEVICE_FLAG_NONE},
+{228, DeviceType::HEATSOURCE, "AM200", DeviceFlags::EMS_DEVICE_FLAG_NONE}, // alternative heatsource
 
 // Connect devices - 0x02
 {171, DeviceType::CONNECT, "OpenTherm Converter", DeviceFlags::EMS_DEVICE_FLAG_NONE},
diff --git a/src/system.cpp b/src/system.cpp
index e48ca2618..24342f4af 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -1330,17 +1330,18 @@ bool System::command_info(const char * value, const int8_t id, JsonObject & outp
             node["pbutton gpio"] = settings.pbutton_gpio;
             node["led gpio"]     = settings.led_gpio;
         }
-        node["hide led"]        = settings.hide_led;
-        node["notoken api"]     = settings.notoken_api;
-        node["readonly mode"]   = settings.readonly_mode;
-        node["fahrenheit"]      = settings.fahrenheit;
-        node["dallas parasite"] = settings.dallas_parasite;
-        node["bool format"]     = settings.bool_format;
-        node["bool dashboard"]  = settings.bool_dashboard;
-        node["enum format"]     = settings.enum_format;
-        node["analog enabled"]  = settings.analog_enabled;
-        node["telnet enabled"]  = settings.telnet_enabled;
-        node["web log buffer"]  = settings.weblog_buffer;
+        node["hide led"]           = settings.hide_led;
+        node["notoken api"]        = settings.notoken_api;
+        node["readonly mode"]      = settings.readonly_mode;
+        node["fahrenheit"]         = settings.fahrenheit;
+        node["dallas parasite"]    = settings.dallas_parasite;
+        node["bool format"]        = settings.bool_format;
+        node["bool dashboard"]     = settings.bool_dashboard;
+        node["enum format"]        = settings.enum_format;
+        node["analog enabled"]     = settings.analog_enabled;
+        node["telnet enabled"]     = settings.telnet_enabled;
+        node["max web log buffer"] = settings.weblog_buffer;
+        node["web log buffer"]     = EMSESP::webLogService.num_log_messages();
     });
 
     // Devices - show EMS devices if we have any