Fixed logos
Merge master