Selective merge from Componenent-traits branch

Did git merge --squash Componenent-traits , and removed changes that
still need to stay on branch. Dirty, as the commit messages will stay in
Component-traits, but quick.
Icons from merge