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

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