Make icon creation more consistent - use sp_icon_new where possible
Update to experimental r13565
Start cleanup for merge into trunk
Added a few swatch related functions (does not compile)