Added display of icons for button and label