fix button conflict + new img
Merge pull request #626 from bechi/feature/new-img

fix button conflict + new img