Updated with new retina icons, database