Add icons to context menus
Fix icon for "Remove Item from Collection"
Merge commit '915a579' into 4.0
Disable context menu icons on OS X