Moved icon styles into demo file.
Improved naming of demo nav items.
Changed tools to have generic names and different icons.