[v1.1.7] Picture support