better more consistent delete buttons
Merge branch 'master' into gh-pages

* master:
  better more consistent delete buttons