Minor fixes + new icon