Fix image sizes, prevent double-moves.