About: fixes of logos
Conflict resolve