New icon, further smoothing functionality
reduced duplication
Merge branch 'debug' of https://github.com/tstein4/urbuses-wear into debug
merged tj's changes for push