Changed Main Dash Icons
Formulas and Formatting
Merge remote-tracking branch 'origin/Sam'
Merge remote-tracking branch 'origin/master' into Eric