Made button icon optional again