Added more icons & added size formatting