close #40
+icon fixes