Logo swapping
Merge branch 'Logo-swap'