Fixed bug with Icons