Icons and UI improvment