Improved watermark padding