icon style and bug fixing