Fix some of the disrepency between button looks
Make the buttons more similar
Fix button height
Merge branch 'develop' into feature/fix-button-look