Move paint from HighlightType to HighlightingImageView

Follow up to the previous pull request