more appropriate icons, close #23