fixed bugs with icons