#9 Icon improvmenets and other stuff