Image facade refactoring