Updates type styles to reflect the app usage
Simplifies button style section, removes dedicated w/icon section