implement new icons and clean up styling