Add icons
Lots of ui improvments
workaround to avoid mute confusion