Revert back to 2-state menu-icon plus cleanups and comments.

Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>