Consolidating on Shapes and LayeredIcons.

The basic thinking is that all Icons and Images will be replaced with
LayeredIcon and all paths and awt shapes will be replaces with Shape
objects where possible.