
        move padding adjustments to inside is_replaced condition

0eb8c06