First pages commit
icons
new icons
Fix conflicts