Changed grouping of icons slightly, to have the primary content types easily accessible.