Not sure if this works, but it looks better than before.

(cherry picked from commit f7ffa6e4)