Merge "Add tint for plus & minus icon"