More Bootstrap3 updates, change <i class to <span class

Just some more bootstrap 3 updates. Updated the <i class to <span class and changed a few of the icon-* to glyphicons.