Added element names to icons as well