Fix border css

Inspired by Ia244a5070

Change-Id: Idd9b1c7076c7f04f421cfbe201b07861095b8a7d
Merge "Fix border css"