Manual merge Guidelines
Set default icon