[Trial] Image fixes

Commit 4