Size of Items in Menus is inconsistently calculated

The width of a menu item is calculated differently when there is an icon for the item compared to when there isn’t one. When the item has an icon, the space between the text of the button and the shortcut text is larger.