Added support for custom size buttons
Merge branch 'refs/heads/custom_size'