Merge "Add tint for edit and setting icon"