ticket:5 picture size and border
ticket:5 merge to master