Fix border css

Inspired by Ia244a5070

Change-Id: Id1625b90d58906a49f8cb89bdf496713878f75e4
Merge "Fix border css"