Edit bar border issue fix for skin