Bootstrap3 and icons

This is a proper pull request done on a separate branch.

Sorry for the last one, it was done on master, my bad.