fix image locations
Merge branch 'fix-image-location' into dev-gradle