Merge "Add tint for hotspot icon"