Added icons. Move code to be available everyplace