Added support for icon only buttons and minor fixes