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

Refactor other classes with new tint method for v2.x.