Baystation Update Merge 04

Icons. A whooole lot of icons. Yay.