Fa icon migration

This fixes most of the icons for issue  #376.


Ooops - looks like an incomplete merge here