Fixed #5671: refactor other classes with new tint method.

refactor other classes with new tint method.