Feature/button image, closes #79 #81