get rid of unnecessary plus signs, change some icons