Some improvements on icons