Icon, bug fixes