Bug 1089572 - Use consistent style of menu items and add highlight back

https://bugzilla.mozilla.org/show_bug.cgi?id=1089572