more adjustments to Cost button, seems to work in all/most default themes
Merge branch 'refs/heads/develop'