some cairo fixes and icon tweaks