[BUG #8514] Minor
[BUG #8514] Fixed image scaling
[BUG #8514] Refactoring