WP-2844:Changes added with padding and border