Fix #244 - Also clean up app/img folder a bit