cleanup and added an .icon class