All icons now drawn programatically, fixes #6