New design
Design update.
App's new design works with the server. Icons.
Manual merge