Svg close buttons

Fixes #5464 and various other bugs with missing close/cross icons.

![ ](http://media.giphy.com/media/13OKQwaECchTb2/giphy.gif)