New icons and some layout
Meging from github