Improved  styles, added non-retina icons