Updated with some icons