Conserved icons and made minor design changes