fix argument parsing & icons