Icons and minor fixes