Button class and icon support (#252)
Select fix for undefined value