Lots of tweaks to button and textfield style calculations

Added Font Awesome for icon testing as well.