Better (?) icons + scaling