NMS-7098, add consistency to Device Menubar