Merge "Add tint for night display icon"