Some bootstrap and icon fixes
More lceanup