Tinted: more updates from Yanuar

Change-Id: I93a88d6d8d2127e405bd0df5f63c282ad2d24758