Goncalo/improvements/image buttons