Bug 1089572 - Use consistent style of menu items and add highlight back
Merge pull request #25825 from crh0716/1089572_2

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