Change logos
Remove macro related code + fixe translation