Icon alignment and placement options

Hey,

Here's a patch for icon and alignment options.  I updated the demo too.

Thanks,
Brian