New Icon, A few bug fixes