Revert "Trimmed the branch to only the rocon_icons sub directory"

This reverts commit 8c9cd9094022bb289d5f22f3862e5b3b6385f74c.
Rebase from 'upstream'
Trimmed the branch to only the rocon_icons sub directory