Change icons
Code cleanup