Fix border style issue for custom styles