fix button conflict + new img

fix conflict with other pull, fix it.
Add new img