use filename for menu icons instead of CSS classes; several clean-ups