HomeKit integration - device icon change

I have installed latest hass on raspberry. I have added HomeKit integration. All devices that are bridged by HASS are seen as simple switch. Either it is TV or a socket it is seen as a single switch. In Home App I can only change it to many types of lights or fans. Is there a way to give it a proper icon? For example, I have a socket on ZigBee that is seen as a switch or Google ChromeCast - the same.

I want to know this as well. its pretty annoying