Revert back to using span instead of button for now
Merge branch 'issue-586' of https://github.com/rarila/bolt into rarila-issue-586

Conflicts:
	app/view/twig/_macro/_macro.twig
git push origin masterMerge branch 'rarila-issue-586'