Button icon span

Working branch right now up for functional review for button re-write