Fix bootstrap3 buttons and icons
Merge pull request #91 from thomasf/master

Fix bootstrap3 buttons and icons (also, fix #87)