Adopt style colour for button icons

Nit: Also wrong include block...