refactored reference to menu icons, to prevent rare crash
refactored reference to menu icons, finalized
fixed errors and updated test