fix issue 167 #167
Merge branch 'hotfix/ui-button-css' into develop