Draw Rules, Icon Types, Geometry Types

Syncing this so I can work on it from home.