Merge remote-tracking branch 'origin/master' into styling
Merge remote-tracking branch 'origin/master' into styling
add new styling resources
update icons