Fixing shapes

Several fixes to get shapes to look right with the new version.
Datastore icon color fix

Hack to fix the color of the datastore icons since the CSS settings keep getting whacked.