Note that I made some changes here. The colors are off and I added some extra icons.
Merge branch 'clearfix' into gh-pages