Improved shape icons, added help 'ribbon;