[DF-1785] optimized painting