Added more app logos
Fixed merge conflict