Layout optimize and matching new icon...