Notification menu icon; fix helper hacks