Merge "Add support for tinting icon menus"