Some style changes, fixes to the gear view and android icons