icons looking good. and some code cleaning