Refactor logo (fixes #403)