Better Icons ans small code-cleanups