Fixed up color and placement issues on the icons.