Merge "Add tint attribute to the icon" into pi-dev