added ability to specify quantity as well as added new icons