New icons at layout fixs
Merge branch 'issue-3/improveUX'