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

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