Update image buttons and remove CustomButton class