Fix logo handling. no more NPE if the logo can't be found. Also, fix location of mcp logo now.