changes to make icons work as expected