Fix border css

Inspired by Ia244a5070

Change-Id: I4ba797849a0b25b2eb0947f0926111260851d29b
Merge "Fix border css"