Fixes layout issues for buttons on standard list items
Fixes text layout issues on checkable list item views
Merge branch 'fix/buttons' into develop

* fix/buttons:
  Fixes text layout issues on checkable list item views
  Fixes layout issues for buttons on standard list items