Fix image locations v2