#master: Fix help message and show/hide icons