Minor fixes + icon