layout now uses new icons