Roo 3.4 icons

Trying this again. Merging roo-icons branch with develop.