New custom Icons
Layout fix and Update