Updated with the final icons from the client