changed icon, code cleanup