Add extra icons
Apply NPE patch from 1.6
Style tweaks
Theme changes
Theming for on-page buttons